Skip to content

Add most controls from Map and Render preview right-click menus to the menu bar #1465

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

Draft
Peregrine05 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add most controls from Map and Render preview right-click menus to the menu bar #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions chunky/src/java/se/llbit/chunky/ui/ChunkMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,7 @@ public ChunkMap(WorldMapLoader loader, ChunkyFxController controller,

selectVisible.setGraphic(new ImageView(Icon.eye.fxImage()));
selectVisible.setOnAction(event -> {
ChunkView chunkView = new ChunkView(view); // Make thread-local copy.
if (controller.getChunky().sceneInitialized()) {
controller.getChunky().getRenderController().getSceneProvider().withSceneProtected(
scene -> selectVisibleChunks(chunkView, scene));
}
selectCameraVisibleChunks();
});

MenuItem exportZip = new MenuItem("Export selected chunks…");
Expand Down Expand Up @@ -214,6 +210,8 @@ public ChunkMap(WorldMapLoader loader, ChunkyFxController controller,
loadSelection.setDisable(noChunksSelected);
exportZip.setDisable(noChunksSelected);
deleteChunks.setDisable(noChunksSelected);

controller.disableMapMenuItems(noChunksSelected);
});
}

Expand Down Expand Up @@ -425,6 +423,14 @@ public int getHeight() {
return mapView.getMapView().height;
}

public void selectCameraVisibleChunks() {
ChunkView chunkView = new ChunkView(view); // Make thread-local copy.
if (controller.getChunky().sceneInitialized()) {
controller.getChunky().getRenderController().getSceneProvider().withSceneProtected(
scene -> selectVisibleChunks(chunkView, scene));
}
}

public void onKeyPressed(KeyEvent keyEvent) {
switch (keyEvent.getCode()) {
case CONTROL:
Expand Down
163 changes: 132 additions & 31 deletions chunky/src/java/se/llbit/chunky/ui/RenderCanvasFx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class RenderCanvasFx extends ScrollPane implements Repaintable, SceneStat

private final AtomicBoolean painting = new AtomicBoolean(false);
private final Canvas canvas;
private final Group guideGroup;
private final Group guideGroup = new Group();
private final StackPane canvasPane;
private final Label noChunksLabel;
private final RenderManager renderManager;
Expand All @@ -81,6 +81,22 @@ public class RenderCanvasFx extends ScrollPane implements Repaintable, SceneStat
private Vector2 target = new Vector2(0, 0);
private Tooltip tooltip = new Tooltip();

private CheckMenuItem showGuides = new CheckMenuItem("Show guides");
private Line hGuide1 = new Line();
private Line hGuide2 = new Line();
private Line vGuide1 = new Line();
private Line vGuide2 = new Line();

private RadioMenuItem percent25 = new RadioMenuItem(String.format("%d%%", 25));
private RadioMenuItem percent50 = new RadioMenuItem(String.format("%d%%", 50));
private RadioMenuItem percent75 = new RadioMenuItem(String.format("%d%%", 75));
private RadioMenuItem percent100 = new RadioMenuItem(String.format("%d%%", 100));
private RadioMenuItem percent150 = new RadioMenuItem(String.format("%d%%", 150));
private RadioMenuItem percent200 = new RadioMenuItem(String.format("%d%%", 200));
private RadioMenuItem percent300 = new RadioMenuItem(String.format("%d%%", 300));
private RadioMenuItem percent400 = new RadioMenuItem(String.format("%d%%", 400));
private RadioMenuItem fit = new RadioMenuItem("Fit to screen");

private boolean fitToScreen = PersistentSettings.getCanvasFitToScreen();

private RenderStatusListener renderListener;
Expand Down Expand Up @@ -110,11 +126,6 @@ public RenderCanvasFx(ChunkyFxController chunkyFxController,
noChunksLabel.setTextAlignment(TextAlignment.CENTER);
canvasPane.getChildren().add(noChunksLabel);

guideGroup = new Group();
Line hGuide1 = new Line();
Line hGuide2 = new Line();
Line vGuide1 = new Line();
Line vGuide2 = new Line();
guideGroup.getChildren().addAll(hGuide1, hGuide2, vGuide1, vGuide2);
canvasPane.getChildren().add(guideGroup);

Expand Down Expand Up @@ -183,44 +194,84 @@ public RenderCanvasFx(ChunkyFxController chunkyFxController,
});
contextMenu.getItems().add(setTarget);

CheckMenuItem showGuides = new CheckMenuItem("Show guides");
showGuides.setSelected(false);
showGuides.selectedProperty().addListener((observable, oldValue, newValue) -> {
hGuide1.setVisible(newValue);
hGuide2.setVisible(newValue);
vGuide1.setVisible(newValue);
vGuide2.setVisible(newValue);
changeShowGuides(newValue);
chunkyFxController.syncShowGuides(newValue);
});
contextMenu.getItems().add(showGuides);

Menu canvasScale = new Menu("Canvas scale");
ToggleGroup scaleGroup = new ToggleGroup();
for (int percent : new int[] { 25, 50, 75, 100, 150, 200, 300, 400 }) {
RadioMenuItem item = new RadioMenuItem(String.format("%d%%", percent));
item.setToggleGroup(scaleGroup);
item.setSelected(PersistentSettings.getCanvasScale() == percent && !fitToScreen);
item.setOnAction(e -> {
updateCanvasScale(percent / 100.0);
PersistentSettings.setCanvasScale(percent);
if (fitToScreen) {
fitToScreen = false;
PersistentSettings.setCanvasFitToScreen(false);
}
});
canvasScale.getItems().add(item);
}
contextMenu.getItems().add(canvasScale);
percent25.setToggleGroup(scaleGroup);
percent50.setToggleGroup(scaleGroup);
percent75.setToggleGroup(scaleGroup);
percent100.setToggleGroup(scaleGroup);
percent150.setToggleGroup(scaleGroup);
percent200.setToggleGroup(scaleGroup);
percent300.setToggleGroup(scaleGroup);
percent400.setToggleGroup(scaleGroup);
fit.setToggleGroup(scaleGroup);

RadioMenuItem fit = new RadioMenuItem("Fit to Screen");
percent25.setSelected(PersistentSettings.getCanvasScale() == 25 && !fitToScreen);
percent50.setSelected(PersistentSettings.getCanvasScale() == 50 && !fitToScreen);
percent75.setSelected(PersistentSettings.getCanvasScale() == 75 && !fitToScreen);
percent100.setSelected(PersistentSettings.getCanvasScale() == 100 && !fitToScreen);
percent150.setSelected(PersistentSettings.getCanvasScale() == 150 && !fitToScreen);
percent200.setSelected(PersistentSettings.getCanvasScale() == 200 && !fitToScreen);
percent300.setSelected(PersistentSettings.getCanvasScale() == 300 && !fitToScreen);
percent400.setSelected(PersistentSettings.getCanvasScale() == 400 && !fitToScreen);
fit.setSelected(fitToScreen);
fit.setToggleGroup(scaleGroup);

percent25.setOnAction(e -> {
changeCanvasScale(25);
chunkyFxController.syncCanvasScale(25);
});
percent50.setOnAction(e -> {
changeCanvasScale(50);
chunkyFxController.syncCanvasScale(50);
});
percent75.setOnAction(e -> {
changeCanvasScale(75);
chunkyFxController.syncCanvasScale(75);
});
percent100.setOnAction(e -> {
changeCanvasScale(100);
chunkyFxController.syncCanvasScale(100);
});
percent150.setOnAction(e -> {
changeCanvasScale(150);
chunkyFxController.syncCanvasScale(150);
});
percent200.setOnAction(e -> {
changeCanvasScale(200);
chunkyFxController.syncCanvasScale(200);
});
percent300.setOnAction(e -> {
changeCanvasScale(300);
chunkyFxController.syncCanvasScale(300);
});
percent400.setOnAction(e -> {
changeCanvasScale(400);
chunkyFxController.syncCanvasScale(400);
});
fit.setOnAction(e -> {
fitToScreen = true;
PersistentSettings.setCanvasFitToScreen(true);
updateCanvasFit();
changeFitToScreen();
chunkyFxController.syncFitToScreen();
});

canvasScale.getItems().add(percent25);
canvasScale.getItems().add(percent50);
canvasScale.getItems().add(percent75);
canvasScale.getItems().add(percent100);
canvasScale.getItems().add(percent150);
canvasScale.getItems().add(percent200);
canvasScale.getItems().add(percent300);
canvasScale.getItems().add(percent400);
canvasScale.getItems().add(fit);

contextMenu.getItems().add(canvasScale);

if (fitToScreen) {
updateCanvasFit();
} else {
Expand Down Expand Up @@ -341,6 +392,56 @@ public RenderCanvasFx(ChunkyFxController chunkyFxController,
});
}

public void changeShowGuides(boolean value) {
hGuide1.setVisible(value);
hGuide2.setVisible(value);
vGuide1.setVisible(value);
vGuide2.setVisible(value);
}

public void syncShowGuides(boolean value) {
showGuides.setSelected(value);
}

public void changeCanvasScale(int percent) {
updateCanvasScale(percent / 100.0);
PersistentSettings.setCanvasScale(percent);
if (fitToScreen) {
fitToScreen = false;
PersistentSettings.setCanvasFitToScreen(false);
}
}

public void syncCanvasScale(int percent) {
if (percent == 25) {
percent25.setSelected(true);
} else if (percent == 50) {
percent50.setSelected(true);
} else if (percent == 75) {
percent75.setSelected(true);
} else if (percent == 100) {
percent100.setSelected(true);
} else if (percent == 150) {
percent150.setSelected(true);
} else if (percent == 200) {
percent200.setSelected(true);
} else if (percent == 300) {
percent300.setSelected(true);
} else if (percent == 400) {
percent400.setSelected(true);
}
}

public void changeFitToScreen() {
fitToScreen = true;
PersistentSettings.setCanvasFitToScreen(true);
updateCanvasFit();
}

public void syncFitToScreen() {
fit.setSelected(true);
}

private void updateCanvasPane() {
Bounds bounds = getViewportBounds();
canvasPane.setMinWidth(Math.max(canvas.getWidth() * canvas.getScaleX(), bounds.getWidth()));
Expand Down
Loading