Fix exception when docking floating window. Refs #8

ricemery · Feb 9, 2017 · 6614eae · 6614eae
1 parent fe506ad
commit 6614eae
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/com/chainstaysoftware/controls/drawerpanefx/AbstractSide.java b/src/main/java/com/chainstaysoftware/controls/drawerpanefx/AbstractSide.java
@@ -59,6 +59,7 @@ abstract class AbstractSide extends Pane {
    private final Region insertionSpacer = new Region();
 
    private boolean allowMultipleOpenDrawers = true;
+   private boolean floatingSelectedChanged = false;
 
    AbstractSide(final Position position,
                 final DragState dragState) {
@@ -436,6 +437,8 @@ private ContextMenu createButtonContextMenu(final DrawerNode node) {
       floatingMenuItem.setSelected(node.isFloating());
       floatingMenuItem.selectedProperty()
          .addListener((observable, oldValue, newValue) -> {
+            floatingSelectedChanged = !newValue;
+
             if (oldValue == newValue) {
                return;
             }
@@ -451,6 +454,8 @@ private ContextMenu createButtonContextMenu(final DrawerNode node) {
                   showNodeInternal(node);
                }
             });
+
+            floatingSelectedChanged = false;
          });
 
 
@@ -495,8 +500,14 @@ private void floatWindow(final DrawerNode node) {
       node.getFloatingX().ifPresent(floatingWindow::setX);
       node.getFloatingY().ifPresent(floatingWindow::setY);
       floatingWindow.setOnCloseRequest(event -> {
-         findButton(node).ifPresent(toggleButton -> toggleButton.setSelected(false));
-         ((Pane)node.getParent()).getChildren().clear();
+         if (!floatingSelectedChanged) {
+            findButton(node).ifPresent(toggleButton -> toggleButton.setSelected(false));
+         }
+
+         final Pane parent = (Pane) node.getParent();
+         if (parent != null) {
+            parent.getChildren().clear();
+         }
       });
       floatingWindow.xProperty().addListener((observable, oldValue, newValue)
          -> node.setFloatingX(newValue.doubleValue()));