edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix chaining ui boxes

Browse Source
This commit is contained in:
luboslenco
2022-12-21 12:08:01 +01:00
parent 6aa0606740
commit e4b630b862
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/ui/UIBox.hx
+2 -1
View File
@@ -44,7 +44,6 @@ class UIBox {
var mx = mouse.x; var mx = mouse.x;
var my = mouse.y; var my = mouse.y;
if ((clickToHide && (mx < left || mx > right || my < top || my > bottom)) || isEscape) { if ((clickToHide && (mx < left || mx > right || my < top || my > bottom)) || isEscape) {
if (modalOnHide != null) modalOnHide();
hide(); hide();
} }
} }
@@ -154,12 +153,14 @@ class UIBox {
} }
static function hideInternal() { static function hideInternal() {
if (modalOnHide != null) modalOnHide();
show = false; show = false;
App.redrawUI(); App.redrawUI();
} }
#if (krom_android || krom_ios) #if (krom_android || krom_ios)
static function tweenIn() { static function tweenIn() {
iron.system.Tween.reset();
iron.system.Tween.to({target: UIBox, props: { tweenAlpha: 0.5 }, duration: 0.2, ease: iron.system.Tween.Ease.ExpoOut}); iron.system.Tween.to({target: UIBox, props: { tweenAlpha: 0.5 }, duration: 0.2, ease: iron.system.Tween.Ease.ExpoOut});
UIBox.hwnd.dragY = Std.int(kha.System.windowHeight() / 2); UIBox.hwnd.dragY = Std.int(kha.System.windowHeight() / 2);
iron.system.Tween.to({target: UIBox.hwnd, props: { dragY: 0 }, duration: 0.2, ease: iron.system.Tween.Ease.ExpoOut, tick: function() { App.redrawUI(); }}); iron.system.Tween.to({target: UIBox.hwnd, props: { dragY: 0 }, duration: 0.2, ease: iron.system.Tween.Ease.ExpoOut, tick: function() { App.redrawUI(); }});