From b58c438015706d98bab138ca7ebec57d56542b3d Mon Sep 17 00:00:00 2001 From: EgzoT Date: Wed, 28 Feb 2018 21:46:27 +0100 Subject: [PATCH] UIMiniWindowContainer small improve (#938) Change type of checking whether window have on drop possibility. Reason: Previously this parameter was checking by class name, so it blocking creating similar objects to miniwindow or inheritance from miniwindow object without changing sources. So it block creating modules with new UI objects working with miniwindowcontainer. --- modules/corelib/ui/uiminiwindow.lua | 1 + modules/corelib/ui/uiminiwindowcontainer.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/corelib/ui/uiminiwindow.lua b/modules/corelib/ui/uiminiwindow.lua index 1790e810..77c65c4a 100644 --- a/modules/corelib/ui/uiminiwindow.lua +++ b/modules/corelib/ui/uiminiwindow.lua @@ -3,6 +3,7 @@ UIMiniWindow = extends(UIWindow, "UIMiniWindow") function UIMiniWindow.create() local miniwindow = UIMiniWindow.internalCreate() + miniwindow.UIMiniWindowContainer = true return miniwindow end diff --git a/modules/corelib/ui/uiminiwindowcontainer.lua b/modules/corelib/ui/uiminiwindowcontainer.lua index a9584158..0bcae84e 100644 --- a/modules/corelib/ui/uiminiwindowcontainer.lua +++ b/modules/corelib/ui/uiminiwindowcontainer.lua @@ -83,7 +83,7 @@ function UIMiniWindowContainer:fitAll(noRemoveChild) end function UIMiniWindowContainer:onDrop(widget, mousePos) - if widget:getClassName() == 'UIMiniWindow' then + if widget.UIMiniWindowContainer then local oldParent = widget:getParent() if oldParent == self then return true