Skip to content

Commit 5fe1066

Browse files
committed
fix window drag
1 parent 47ee9f5 commit 5fe1066

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

haxe/ui/containers/windows/Window.hx

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
package haxe.ui.containers.windows;
22

3-
import haxe.ui.util.Variant;
4-
import haxe.ui.containers.dialogs.Dialog;
5-
import haxe.ui.containers.dialogs.Dialog.DialogEvent;
3+
import haxe.ui.behaviours.DataBehaviour;
4+
import haxe.ui.components.Image;
5+
import haxe.ui.components.Label;
66
import haxe.ui.containers.dialogs.Dialog.DialogButton;
7+
import haxe.ui.containers.dialogs.Dialog.DialogEvent;
8+
import haxe.ui.containers.dialogs.Dialog;
79
import haxe.ui.containers.dialogs.MessageBox;
8-
import haxe.ui.components.Label;
9-
import haxe.ui.components.Image;
10-
import haxe.ui.geom.Point;
11-
import haxe.ui.core.Screen;
12-
import haxe.ui.geom.Rectangle;
13-
import haxe.ui.geom.Slice9;
14-
import haxe.ui.events.MouseEvent;
1510
import haxe.ui.core.Component;
1611
import haxe.ui.core.CompositeBuilder;
17-
import haxe.ui.behaviours.DataBehaviour;
12+
import haxe.ui.core.Screen;
13+
import haxe.ui.dragdrop.DragManager;
14+
import haxe.ui.events.MouseEvent;
1815
import haxe.ui.extensions.Draggable;
16+
import haxe.ui.geom.Point;
17+
import haxe.ui.geom.Rectangle;
18+
import haxe.ui.geom.Slice9;
19+
import haxe.ui.util.Variant;
1920

2021
@:xml('
2122
<vbox style="spacing:0;">
@@ -442,6 +443,10 @@ private class Builder extends CompositeBuilder {
442443
return;
443444
}
444445

446+
if (DragManager.instance.isDragging) {
447+
return;
448+
}
449+
445450
_resizeN = false;
446451
_resizeE = false;
447452
_resizeS = false;

haxe/ui/dragdrop/DragManager.hx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package haxe.ui.dragdrop;
22

33
import haxe.ui.Toolkit;
4+
import haxe.ui.core.Component;
5+
import haxe.ui.core.Screen;
46
import haxe.ui.events.DragEvent;
7+
import haxe.ui.events.MouseEvent;
58
import haxe.ui.events.UIEvent;
69
import haxe.ui.geom.Point;
7-
import haxe.ui.util.MathUtil;
810
import haxe.ui.geom.Rectangle;
9-
import haxe.ui.core.Screen;
10-
import haxe.ui.core.Component;
11-
import haxe.ui.events.MouseEvent;
11+
import haxe.ui.util.MathUtil;
1212

1313
class DragManager {
1414
private static var _instance:DragManager;

0 commit comments

Comments
 (0)