fix dock area indicator relative to scene

RobertBColton · Apr 27, 2018 · f369da8 · f369da8
1 parent e66e091
commit f369da8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.dockfx</groupId>
     <artifactId>dockfx</artifactId>
     <packaging>jar</packaging>
-    <version>0.2-SNAPSHOT</version>
+    <version>0.4-SNAPSHOT</version>
     <name>DockFX</name>
     <url>https://github.com/RobertBColton/DockFX.git</url>
 

diff --git a/src/main/java/org/dockfx/DockPane.java b/src/main/java/org/dockfx/DockPane.java
@@ -572,7 +572,7 @@ public void handle(DockEvent event) {
       }
 
       if (dockPosDrag != null) {
-        Point2D originToScene = dockAreaDrag.localToScene(0, 0);
+        Point2D originToScene = dockAreaDrag.localToScene(0, 0).subtract(this.localToScene(0, 0));
 
         dockAreaIndicator.setVisible(true);
         dockAreaIndicator.relocate(originToScene.getX(), originToScene.getY());

diff --git a/src/main/java/org/dockfx/DockTitleBar.java b/src/main/java/org/dockfx/DockTitleBar.java
@@ -24,10 +24,6 @@
 import java.util.List;
 import java.util.Stack;
 
-import com.sun.javafx.stage.StageHelper;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.event.EventHandler;

diff --git a/src/main/java/org/dockfx/demo/DockFX.java b/src/main/java/org/dockfx/demo/DockFX.java
@@ -32,14 +32,21 @@
 
 import javafx.application.Application;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.Separator;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
+import javafx.scene.control.ToolBar;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.VBox;
 import javafx.scene.web.HTMLEditor;
 import javafx.stage.Stage;
 
@@ -98,7 +105,31 @@ public void start(Stage primaryStage) {
     tableDock.setPrefSize(300, 100);
     tableDock.dock(dockPane, DockPos.BOTTOM);
 
-    primaryStage.setScene(new Scene(dockPane, 800, 500));
+    final Menu menu1 = new Menu("File");
+    final Menu menu2 = new Menu("Options");
+    final Menu menu3 = new Menu("Help");
+
+    MenuBar menuBar = new MenuBar();
+    menuBar.getMenus().addAll(menu1, menu2, menu3);
+
+    ToolBar toolBar = new ToolBar(
+        new Button("New"),
+        new Button("Open"),
+        new Button("Save"),
+        new Separator(),
+        new Button("Clean"),
+        new Button("Compile"),
+        new Button("Run"),
+        new Separator(),
+        new Button("Debug"),
+        new Button("Profile")
+    );
+
+    VBox vbox = new VBox();
+    vbox.getChildren().addAll(menuBar, toolBar, dockPane);
+    VBox.setVgrow(dockPane, Priority.ALWAYS);
+
+    primaryStage.setScene(new Scene(vbox, 800, 500));
     primaryStage.sizeToScene();
 
     primaryStage.show();