diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java index 8e7b9c452f6c3687b70dfbb0ecd046224f443663..443713d7375966870a8d2ad0d64bf07147f62f39 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java @@ -22,6 +22,7 @@ import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.MenuItem; import javafx.scene.control.Slider; +import javafx.scene.layout.StackPane; public class TouchMenuToolbarViewController extends BasicMenuToolbarViewController { @@ -48,6 +49,10 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll public void init() { super.init(); volumeSlider.focusedProperty().addListener(i -> mainViewController.getParent().requestFocus()); + + StackPane graphic = new StackPane(); + graphic.getStyleClass().setAll("graphic"); + closeButton.setGraphic(graphic); } @Override diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java index 1dc3ef9532a6cfcfd8648eac01fe4de58907821c..b95f7114ef777163d15aba66eb03c1e8ac195872 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java @@ -151,8 +151,6 @@ public class MainViewController extends NVC implements IMainViewController, Noti padGridPane.getStyleClass().add("pad-grid"); notificationPane = new NotificationPane(padGridPane); - notificationPane.getStyleClass().add(org.controlsfx.control.NotificationPane.STYLE_CLASS_DARK); - gridContainer.getChildren().add(notificationPane); setAnchor(notificationPane, 0, 0, 0, 0); diff --git a/PlayWall/src/main/resources/style/components/notification-pane.css b/PlayWall/src/main/resources/style/components/notification-pane.css new file mode 100644 index 0000000000000000000000000000000000000000..dc2c70e723edb130f42d066eb6768920f40e72f7 --- /dev/null +++ b/PlayWall/src/main/resources/style/components/notification-pane.css @@ -0,0 +1,16 @@ +.notification-pane { + -fx-background-color: #282828; +} + +.notification-pane.top .notification-bar > .pane { + -fx-effect: none; +} + +.notification-pane .notification-bar > .pane .label { + -fx-text-fill: #CCCCCC; +} + +.notification-pane .notification-bar > .pane .close-button:hover { + -fx-background-color: #878787; + -fx-text-fill: #EEEEEE !important; +} \ No newline at end of file diff --git a/PlayWall/src/main/resources/style/components/radiobutton.css b/PlayWall/src/main/resources/style/components/radiobutton.css index 57bbbfe5e36143ab8f902faf707ecc78f16e07f9..ab9218e9ca0cd46c056dd34b5fba2979474253dc 100644 --- a/PlayWall/src/main/resources/style/components/radiobutton.css +++ b/PlayWall/src/main/resources/style/components/radiobutton.css @@ -10,7 +10,7 @@ -fx-background-color: transparent; -fx-background-insets: 0 0 0 0 0, 0; -fx-padding: 0.333333em; - -fx-shape: "M-1,0a1,1 0 1,0 2,0a1,1 0 1,0 -2,0"; + -fx-shape: "M-1,0a1,1 0 1,0 2,0a1,1 0 1,0 -2,0"; /* http://complexdan.com/svg-circleellipse-to-path-converter/ */ -fx-scale-x: 1.5; -fx-scale-y: 1.5; } diff --git a/PlayWall/src/main/resources/style/touch.css b/PlayWall/src/main/resources/style/touch.css index d4bb73efa8b54e77eeeadf959c8d327dc98ff254..2a745726ffce42e0f0eb3f06f20ca862610d84df 100644 --- a/PlayWall/src/main/resources/style/touch.css +++ b/PlayWall/src/main/resources/style/touch.css @@ -18,4 +18,14 @@ .slider .thumb { -fx-pref-height: 25px; -fx-pref-width: 25px; +} + +.close-button > .graphic { + -fx-background-color: white; + -fx-scale-shape: false; + -fx-padding: 1; + + -fx-scale-x: 1.8; + -fx-scale-y: 1.8; + -fx-shape: "M395.992,296.758l1.794-1.794l7.292,7.292l-1.795,1.794 L395.992,296.758z M403.256,294.992l1.794,1.794l-7.292,7.292l-1.794-1.795 L403.256,294.992z"; } \ No newline at end of file diff --git a/PlayWall/src/main/resources/view/main/touch/Header.fxml b/PlayWall/src/main/resources/view/main/touch/Header.fxml index 09fadd1ea8f83f93b40358b3bbfa05e0f74b108a..2c9b346a42af0a85b71dfc8ae1ea7a8ca78c6fcd 100644 --- a/PlayWall/src/main/resources/view/main/touch/Header.fxml +++ b/PlayWall/src/main/resources/view/main/touch/Header.fxml @@ -35,6 +35,6 @@ </Label> </children> </HBox> - <Button fx:id="closeButton" focusTraversable="false" mnemonicParsing="false" onAction="#closeMenuItemHandler" text="X" /> + <Button fx:id="closeButton" styleClass="close-button" focusTraversable="false" mnemonicParsing="false" onAction="#closeMenuItemHandler" minWidth="60" /> </children> </HBox> diff --git a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala index f9b280dfd3b2970bdc89af41c0ef0fd25194c1db..474a16aa632f8002d2b1c618a5e6d1092bd59d83 100644 --- a/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala +++ b/PlayWall/src/main/scala/de/tobias/playpad/design/ModernGlobalDesignHandlerImpl.scala @@ -35,6 +35,7 @@ class ModernGlobalDesignHandlerImpl extends ModernGlobalDesignHandler with Color "style/components/radiobutton.css", "style/components/slider.css", "style/components/tabs.css", + "style/components/notification-pane.css", "style/components/menu.css", "style/components/toggle-button.css", "style/components/list.css",