Skip to content

Commit f369da8

Browse files
committed
fix dock area indicator relative to scene
1 parent e66e091 commit f369da8

4 files changed

Lines changed: 34 additions & 7 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>org.dockfx</groupId>
77
<artifactId>dockfx</artifactId>
88
<packaging>jar</packaging>
9-
<version>0.2-SNAPSHOT</version>
9+
<version>0.4-SNAPSHOT</version>
1010
<name>DockFX</name>
1111
<url>https://github.com/RobertBColton/DockFX.git</url>
1212

src/main/java/org/dockfx/DockPane.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ public void handle(DockEvent event) {
572572
}
573573

574574
if (dockPosDrag != null) {
575-
Point2D originToScene = dockAreaDrag.localToScene(0, 0);
575+
Point2D originToScene = dockAreaDrag.localToScene(0, 0).subtract(this.localToScene(0, 0));
576576

577577
dockAreaIndicator.setVisible(true);
578578
dockAreaIndicator.relocate(originToScene.getX(), originToScene.getY());

src/main/java/org/dockfx/DockTitleBar.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
import java.util.List;
2525
import java.util.Stack;
2626

27-
import com.sun.javafx.stage.StageHelper;
28-
29-
import javafx.collections.FXCollections;
30-
import javafx.collections.ObservableList;
3127
import javafx.event.ActionEvent;
3228
import javafx.event.Event;
3329
import javafx.event.EventHandler;

src/main/java/org/dockfx/demo/DockFX.java

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,21 @@
3232

3333
import javafx.application.Application;
3434
import javafx.scene.Scene;
35+
import javafx.scene.control.Button;
36+
import javafx.scene.control.Menu;
37+
import javafx.scene.control.MenuBar;
38+
import javafx.scene.control.Separator;
3539
import javafx.scene.control.Tab;
3640
import javafx.scene.control.TabPane;
3741
import javafx.scene.control.TableColumn;
3842
import javafx.scene.control.TableView;
43+
import javafx.scene.control.ToolBar;
3944
import javafx.scene.control.TreeItem;
4045
import javafx.scene.control.TreeView;
4146
import javafx.scene.image.Image;
4247
import javafx.scene.image.ImageView;
48+
import javafx.scene.layout.Priority;
49+
import javafx.scene.layout.VBox;
4350
import javafx.scene.web.HTMLEditor;
4451
import javafx.stage.Stage;
4552

@@ -98,7 +105,31 @@ public void start(Stage primaryStage) {
98105
tableDock.setPrefSize(300, 100);
99106
tableDock.dock(dockPane, DockPos.BOTTOM);
100107

101-
primaryStage.setScene(new Scene(dockPane, 800, 500));
108+
final Menu menu1 = new Menu("File");
109+
final Menu menu2 = new Menu("Options");
110+
final Menu menu3 = new Menu("Help");
111+
112+
MenuBar menuBar = new MenuBar();
113+
menuBar.getMenus().addAll(menu1, menu2, menu3);
114+
115+
ToolBar toolBar = new ToolBar(
116+
new Button("New"),
117+
new Button("Open"),
118+
new Button("Save"),
119+
new Separator(),
120+
new Button("Clean"),
121+
new Button("Compile"),
122+
new Button("Run"),
123+
new Separator(),
124+
new Button("Debug"),
125+
new Button("Profile")
126+
);
127+
128+
VBox vbox = new VBox();
129+
vbox.getChildren().addAll(menuBar, toolBar, dockPane);
130+
VBox.setVgrow(dockPane, Priority.ALWAYS);
131+
132+
primaryStage.setScene(new Scene(vbox, 800, 500));
102133
primaryStage.sizeToScene();
103134

104135
primaryStage.show();

0 commit comments

Comments
 (0)