From 5e30d243229af0fc4c1a4ef9fca805e2d06478a0 Mon Sep 17 00:00:00 2001 From: Ruan Gustavo Date: Thu, 17 Feb 2022 14:46:34 -0300 Subject: [PATCH 1/2] Fix black border due to display theme picker minimum width --- .../src/main/java/gearth/ui/titlebar/TitleBarController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java index aeefe0d..1e4bf0b 100644 --- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java +++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java @@ -93,6 +93,10 @@ public class TitleBarController { if (!config.displayMinimizeButton()) { ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn); } + + if (!config.displayThemePicker()) { + ((GridPane) controller.themeBtn.getParent()).getChildren().remove(controller.themeBtn); + } }); return controller; } From 067a21444518fc33c249f58c55709e867164d225 Mon Sep 17 00:00:00 2001 From: Ruan Gustavo Date: Thu, 17 Feb 2022 17:21:04 -0300 Subject: [PATCH 2/2] Fix black border due to display picker theme minimum width --- .../src/main/java/gearth/ui/titlebar/TitleBarController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java index 1e4bf0b..ed9c87f 100644 --- a/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java +++ b/G-Earth/src/main/java/gearth/ui/titlebar/TitleBarController.java @@ -89,7 +89,6 @@ public class TitleBarController { stage.getScene().setFill(Color.TRANSPARENT); stage.getScene().getRoot().getStyleClass().add("root-node"); - controller.themeBtn.setVisible(config.displayThemePicker()); if (!config.displayMinimizeButton()) { ((GridPane) controller.minimizeBtn.getParent()).getChildren().remove(controller.minimizeBtn); } @@ -111,7 +110,6 @@ public class TitleBarController { Platform.runLater(() -> titleLabel.setText(title)); } - public void handleCloseAction(MouseEvent event) { config.onCloseClicked(); }