TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2025-12-20 11:09:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Horisontal slider reacting on scroll

Browse Source 
Добавил реагирование горизонтальных слайдеров на скроллинг
This commit is contained in:
Smok1e 2021-07-10 01:27:20 +03:00
parent 50023e375d
commit 898ea448d0
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Libraries/GUI.lua
View File

@ -1,4 +1,3 @@
local keyboard = require("Keyboard")
local filesystem = require("Filesystem")
local event = require("Event")
@ -1396,7 +1395,7 @@ local function sliderDraw(object)
return object
end
local function sliderEventHandler(workspace, object, e1, e2, e3, ...)
local function sliderEventHandler(workspace, object, e1, e2, e3, e4, e5, ...)
if e1 == "touch" or e1 == "drag" then
local clickPosition = e3 - object.x
@ -1411,7 +1410,19 @@ local function sliderEventHandler(workspace, object, e1, e2, e3, ...)
workspace:draw()
if object.onValueChanged then
object.onValueChanged(workspace, object, e1, e2, e3, ...)
object.onValueChanged(workspace, object, e1, e2, e3, e4, e5, ...)
end
elseif e1 == "scroll" then
object.value = object.value + (object.maximumValue-object.minimumValue)*object.scrollSensivity * e5
if object.value > object.maximumValue then object.value = object.maximumValue
elseif object.value < object.minimumValue then object.value = object.minimumValue end
workspace:draw ()
if object.onValueChanged then
object.onValueChanged (workspace, object, e1, e2, e3, e4, e5, ...)
end
end
end
@ -1425,6 +1436,7 @@ function GUI.slider(x, y, width, activeColor, passiveColor, pipeColor, valueColo
object.minimumValue = minimumValue
object.maximumValue = maximumValue
object.value = value
object.scrollSensivity = 0.05
object.showMaximumAndMinimumValues = showMaximumAndMinimumValues
object.currentValuePrefix = currentValuePrefix
object.currentValuePostfix = currentValuePostfix
@ -4254,14 +4266,17 @@ end
local function windowEventHandler(workspace, window, e1, e2, e3, e4, ...)
if window.movingEnabled then
if e1 == "touch" then
GUI.focusedObject = window
if not windowCheck(window, e3, e4) then
window.lastTouchX, window.lastTouchY = e3, e4
end
if window ~= window.parent.children[#window.parent.children] then
window:focus()
window:moveToFront()
if window.onFocus then
window.onFocus(workspace, window, e1, e2, e3, e4, ...)
end
workspace:draw()
end
elseif e1 == "drag" and window.lastTouchX and not windowCheck(window, e3, e4) then
@ -4332,22 +4347,11 @@ function GUI.windowMinimize(window)
window.hidden = not window.hidden
end
function GUI.windowFocus(window)
GUI.focusedObject = window
window.hidden = false
window:moveToFront()
if window.onFocus then
window.onFocus()
end
end
function GUI.window(x, y, width, height)
local window = GUI.container(x, y, width, height)
window.passScreenEvents = false
window.focus = GUI.windowFocus
window.resize = windowResize
window.maximize = GUI.windowMaximize
window.minimize = GUI.windowMinimize