Skip to content

Issue #17: Modify DragDropStage to mirror the previous DockContainerLeaf's DockContainerLeafMenuFactory and Side values. #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Col-E merged 4 commits into from
Apr 17, 2026
Merged

Issue #17: Modify DragDropStage to mirror the previous DockContainerLeaf's DockContainerLeafMenuFactory and Side values. #31

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b193b30
BENTO-17:
Apr 15, 2026
7470205
BENTO-17:
Apr 15, 2026
d3158d3
Simplify stage building with assumption Dockable parent will always b…
Col-E Apr 17, 2026
aab56bc
Merge branch 'master' into pr/31
Col-E Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions core/src/main/java/software/coley/bentofx/building/StageBuilding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package software.coley.bentofx.building;

import javafx.geometry.Side;
import javafx.scene.Scene;
import javafx.scene.layout.Region;
import javafx.stage.Stage;
Expand All @@ -8,8 +9,8 @@
import software.coley.bentofx.Bento;
import software.coley.bentofx.control.DragDropStage;
import software.coley.bentofx.dockable.Dockable;
import software.coley.bentofx.layout.DockContainer;
import software.coley.bentofx.layout.container.DockContainerLeaf;
import software.coley.bentofx.layout.container.DockContainerLeafMenuFactory;
import software.coley.bentofx.layout.container.DockContainerRootBranch;

/**
Expand All @@ -27,7 +28,7 @@ public StageBuilding(Bento bento) {
}

/**
* Create a new stage for the given dockable.,
* Create a new stage for the given dockable.
*
* @param sourceScene
* Original scene to copy state from.
Expand All @@ -38,15 +39,17 @@ public StageBuilding(Bento bento) {
*
* @return Newly created stage.
*/
public DragDropStage newStageForDockable(Scene sourceScene, DockContainer source, Dockable dockable) {
public DragDropStage newStageForDockable(Scene sourceScene, DockContainerLeaf source, Dockable dockable) {
Region sourceRegion = source.asRegion();
Comment thread
Col-E marked this conversation as resolved.
double width = sourceRegion.getWidth();
double height = sourceRegion.getHeight();
return newStageForDockable(sourceScene, dockable, width, height);
final DockContainerLeafMenuFactory leafMenuFactory = source.getMenuFactory();
final Side side = source.getSide();
return newStageForDockable(sourceScene, dockable, width, height, leafMenuFactory, side);
}

/**
* Create a new stage for the given dockable.,
* Create a new stage for the given dockable.
*
* @param sourceScene
* Original scene to copy state from.
Expand All @@ -56,18 +59,30 @@ public DragDropStage newStageForDockable(Scene sourceScene, DockContainer source
* Preferred stage width.
* @param height
* Preferred stage height.
* @param leafMenuFactory
* DockContainerLeafMenuFactory for creating leaf menus
* @param side
* Side of this container to place {@code Header} displays on.
* {@code null} to not display any headers.
*
* @return Newly created stage.
*/
public DragDropStage newStageForDockable(@Nullable Scene sourceScene, Dockable dockable, double width, double height) {
public DragDropStage newStageForDockable(@Nullable Scene sourceScene,
Dockable dockable,
double width,
double height,
@Nullable DockContainerLeafMenuFactory leafMenuFactory,
@Nullable Side side) {
DockBuilding builder = bento.dockBuilding();
DockContainerRootBranch root = builder.root();
DockContainerLeaf leaf = builder.leaf();
leaf.setMenuFactory(leafMenuFactory);
leaf.setSide(side);
return newStageForDockable(sourceScene, root, leaf, dockable, width, height);
}

/**
* Create a new stage for the given dockable.,
* Create a new stage for the given dockable.
*
* @param sourceScene
* Original scene to copy state from.
Expand Down
Loading