diff --git a/Basalt/Frame.lua b/Basalt/Frame.lua index a8dc6de..6a71859 100644 --- a/Basalt/Frame.lua +++ b/Basalt/Frame.lua @@ -885,20 +885,20 @@ return function(name, parent, pTerm, basalt) end end, - mouseHandler = function(self, button, x, y, _, side) + mouseHandler = function(self, button, x, y, touch, side) if(isGroupedMonitor)then if(termObject.calculateClick~=nil)then x, y = termObject.calculateClick(side, x, y) end end - if(base.mouseHandler(self, button, x, y))then + if(base.mouseHandler(self, button, x, y, touch))then if(events["mouse_click"]~=nil)then self:setCursor(false) for _, index in ipairs(eventZIndex["mouse_click"]) do if (events["mouse_click"][index] ~= nil) then for _, value in rpairs(events["mouse_click"][index]) do if (value.mouseHandler ~= nil) then - if (value:mouseHandler(button, x, y)) then + if (value:mouseHandler(button, x, y, touch)) then return true end diff --git a/Basalt/main.lua b/Basalt/main.lua index 120222d..284000e 100644 --- a/Basalt/main.lua +++ b/Basalt/main.lua @@ -436,6 +436,10 @@ basalt = { projectDirectory = dir end, + forceRenderUpdate = function() + drawFrames() + end, + debug = function(...) local args = { ... } if(mainFrame==nil)then print(...) return end diff --git a/Basalt/objects/Dropdown.lua b/Basalt/objects/Dropdown.lua index 2dbf66e..4a66928 100644 --- a/Basalt/objects/Dropdown.lua +++ b/Basalt/objects/Dropdown.lua @@ -124,7 +124,7 @@ return function(name) return dropdownW, dropdownH end, - mouseHandler = function(self, button, x, y) + mouseHandler = function(self, button, x, y, touch) if (isOpened) then local obx, oby = self:getAbsolutePosition(self:getAnchorPosition()) if(button==1)then @@ -135,6 +135,9 @@ return function(name) self:setValue(list[n + yOffset]) self:updateDraw() local val = self:getEventSystem():sendEvent("mouse_click", self, "mouse_click", dir, x, y) + if(touch)then + self:mouseUpHandler(button, x, y) + end if(val==false)then return val end return true end