better way to fetch click on 'About' menu

Querz · Sep 21, 2018 · 56866ec · 56866ec
1 parent 1b28ab9
commit 56866ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/net/querz/mcaselector/ui/OptionBar.java b/src/main/java/net/querz/mcaselector/ui/OptionBar.java
@@ -21,7 +21,7 @@ public class OptionBar extends MenuBar {
 	private Menu view = menu("View");
 	private Menu selection = menu("Selection");
 	private Menu tools = menu("Tools");
-	private Menu about = menu("About");
+	private Label about = new Label("About");
 
 	private MenuItem open = menuItem("Open");
 	private MenuItem quit = menuItem("Quit");
@@ -46,7 +46,6 @@ public OptionBar(TileMap tileMap, Stage primaryStage) {
 
 		tileMap.setOnUpdate(this::onUpdate);
 
-		getMenus().addAll(file, view, selection, tools, about);
 		file.getItems().addAll(open, quit);
 		view.getItems().addAll(
 				chunkGrid, regionGrid, separator(),
@@ -58,14 +57,11 @@ exportChunks, delete, separator(),
 				importSelection, exportSelection, separator(),
 				clearSelectionCache);
 		tools.getItems().addAll(filterChunks, changeFields);
+		about.setOnMouseClicked(e -> Helper.showAboutDialog(tileMap, primaryStage));
+		Menu aboutMenu = new Menu();
+		aboutMenu.setGraphic(about);
 
-		//add dummy menu item to be able to use listener on showingProperty
-		about.getItems().add(new MenuItem());
-		about.showingProperty().addListener((a, oldValue, newValue) -> {
-			if (newValue) {
-				Helper.showAboutDialog(tileMap, primaryStage);
-			}
-		});
+		getMenus().addAll(file, view, selection, tools, aboutMenu);
 
 		open.setOnAction(e -> Helper.openWorld(tileMap, primaryStage, this));
 		quit.setOnAction(e -> System.exit(0));

diff --git a/src/main/resources/style.css b/src/main/resources/style.css
@@ -67,7 +67,7 @@
 }
 
 /* menu text color and check-menu icon */
-.menu >.label, .menu-item >.label, .check-menu-item {
+.menu .label, .menu-item >.label, .check-menu-item {
 	-fx-text-fill: -color-text-light;
 	-fx-focused-mark-color: -color-check-menu-item-enabled;
 	-fx-mark-color: -color-check-menu-item-enabled;