From 059759d1c0298d9143ef0e86d2a974ab6f2b2cfe Mon Sep 17 00:00:00 2001 From: Robert Jelic <36573031+NoryiE@users.noreply.github.com> Date: Thu, 18 May 2023 13:42:55 +0200 Subject: [PATCH] Small Fix Fixed removeChildren for movable frames and scrollable frames --- Basalt/objects/MovableFrame.lua | 7 +++++++ Basalt/objects/ScrollableFrame.lua | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/Basalt/objects/MovableFrame.lua b/Basalt/objects/MovableFrame.lua index 874c702..df38b43 100644 --- a/Basalt/objects/MovableFrame.lua +++ b/Basalt/objects/MovableFrame.lua @@ -40,6 +40,13 @@ return function(name, basalt) self:listenEvent("mouse_drag") end, + removeChildren = function(self) + base.removeChildren(self) + self:listenEvent("mouse_click") + self:listenEvent("mouse_up") + self:listenEvent("mouse_drag") + end, + dragHandler = function(self, btn, x, y) if(base.dragHandler(self, btn, x, y))then if (isDragging) then diff --git a/Basalt/objects/ScrollableFrame.lua b/Basalt/objects/ScrollableFrame.lua index d138b38..9dad9af 100644 --- a/Basalt/objects/ScrollableFrame.lua +++ b/Basalt/objects/ScrollableFrame.lua @@ -98,6 +98,11 @@ return function(name, basalt) self:listenEvent("mouse_scroll") end, + removeChildren = function(self) + base.removeChildren(self) + self:listenEvent("mouse_scroll") + end, + setParent = function(self, p, ...) base.setParent(self, p, ...) parent = p