Fix RobertBColton#38, handling multiple panes in the context of event…

… handlers.
hkmoon · Jun 24, 2019 · af5f18c · af5f18c
1 parent 868ac6a
commit af5f18c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/dockfx/DockNode.java b/src/main/java/org/dockfx/DockNode.java
@@ -1124,6 +1124,11 @@ public Node getLastDockSibling()
     return lastDockSibling;
   }
 
+  private DockPane prevDockPane;
+
+  public DockPane getPrevDockPane() {
+  	return prevDockPane;
+  }
   /**
    * Dock this node into a dock pane.
    * 
@@ -1163,6 +1168,7 @@ private final void dockImpl(DockPane dockPane)
     {
       setFloating(false);
     }
+    this.prevDockPane = this.dockPane;
     this.dockPane = dockPane;
     this.dockedProperty.set(true);
     this.closedProperty.set(false);

diff --git a/src/main/java/org/dockfx/DockTitleBar.java b/src/main/java/org/dockfx/DockTitleBar.java
@@ -620,7 +620,7 @@ public void run(Node node, Node dragNode)
       dragNodes.clear();
 
       // Remove temporary event handler for bug mentioned above.
-      DockPane dockPane = this.getDockNode().getDockPane();
+      DockPane dockPane = this.getDockNode().getPrevDockPane();
       if (dockPane != null)
       {
         dockPane.removeEventFilter(MouseEvent.MOUSE_DRAGGED, this);