From a4e3eaadf735dc68a7f73b3975b049eaf4cd163f Mon Sep 17 00:00:00 2001 From: iMoHax Date: Fri, 25 Jul 2014 15:42:40 +0400 Subject: [PATCH] fix dialogs pane background --- client/src/main/java/ru/trader/Main.java | 2 +- .../java/ru/trader/controllers/Screeners.java | 7 ++++ client/src/main/resources/view/orders.fxml | 2 +- client/src/main/resources/view/style.css | 32 +++++++++++++++++++ client/src/main/resources/view/vEditor.fxml | 2 +- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/client/src/main/java/ru/trader/Main.java b/client/src/main/java/ru/trader/Main.java index db7e001..9ecb824 100644 --- a/client/src/main/java/ru/trader/Main.java +++ b/client/src/main/java/ru/trader/Main.java @@ -23,7 +23,6 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception { - loadResources(); primaryStage.setTitle("Trader"); primaryStage.setScene(new Scene(Screeners.newScreeners(Main.class.getResource("/view/main.fxml"),getUrl("style.css").toExternalForm()))); primaryStage.setOnCloseRequest((we)->{ @@ -39,6 +38,7 @@ public class Main extends Application { Screeners.showException(e); } }); + loadResources(); primaryStage.show(); } diff --git a/client/src/main/java/ru/trader/controllers/Screeners.java b/client/src/main/java/ru/trader/controllers/Screeners.java index 891a6d9..129571b 100644 --- a/client/src/main/java/ru/trader/controllers/Screeners.java +++ b/client/src/main/java/ru/trader/controllers/Screeners.java @@ -37,16 +37,21 @@ public class Screeners { return mainScreen; } + private static void addStylesheet(Parent screen){ + screen.getStylesheets().addAll(mainScreen.getStylesheets()); + } public static void loadItemDescStage(URL fxml) throws IOException { FXMLLoader loader = new FXMLLoader(fxml); itemDescScreen = loader.load(); + addStylesheet(itemDescScreen); itemDescController = loader.getController(); } public static void loadVEditorStage(URL fxml) throws IOException { FXMLLoader loader = new FXMLLoader(fxml); vEditorScreen = loader.load(); + addStylesheet(vEditorScreen); vEditorController = loader.getController(); Stage stage = new Stage(); stage.setScene(new Scene(vEditorScreen)); @@ -55,6 +60,7 @@ public class Screeners { public static void loadAddOfferStage(URL fxml) throws IOException { FXMLLoader loader = new FXMLLoader(fxml); editOffersScreen = loader.load(); + addStylesheet(editOffersScreen); oEditorController = loader.getController(); Stage stage = new Stage(); stage.setScene(new Scene(editOffersScreen)); @@ -63,6 +69,7 @@ public class Screeners { public static void loadOrdersStage(URL fxml) throws IOException { FXMLLoader loader = new FXMLLoader(fxml); ordersScreen = loader.load(); + addStylesheet(ordersScreen); ordersController = loader.getController(); Stage stage = new Stage(); stage.setScene(new Scene(ordersScreen)); diff --git a/client/src/main/resources/view/orders.fxml b/client/src/main/resources/view/orders.fxml index 754911f..da7fb02 100644 --- a/client/src/main/resources/view/orders.fxml +++ b/client/src/main/resources/view/orders.fxml @@ -10,7 +10,7 @@ + fx:controller="ru.trader.controllers.OrdersController" styleClass="dialog"> diff --git a/client/src/main/resources/view/style.css b/client/src/main/resources/view/style.css index 9b7e6e8..38457a6 100644 --- a/client/src/main/resources/view/style.css +++ b/client/src/main/resources/view/style.css @@ -8,4 +8,36 @@ -fx-font-weight: bold; } +.table-view:focused { + -fx-background-color: -fx-box-border, -fx-control-inner-background; + -fx-background-insets: 0,1; + -fx-background-radius: 0, 0; +} +HBox.fields-group { + -fx-spacing: 2; + -fx-padding: 5 10; + -fx-alignment: baseline-left; +} + +HBox.fields-group hbox-margin{ + -fx-left: 100px; +} + + +/* Dialogs */ +.dialog { + -fx-background-color: inherit; +} + +/* Items */ + +#tblItems { + -fx-padding: 0; +} + +/* support styles */ + +.center { + -fx-alignment: center; +} diff --git a/client/src/main/resources/view/vEditor.fxml b/client/src/main/resources/view/vEditor.fxml index 43882cd..195b7d1 100644 --- a/client/src/main/resources/view/vEditor.fxml +++ b/client/src/main/resources/view/vEditor.fxml @@ -6,7 +6,7 @@ + fx:controller="ru.trader.controllers.VendorEditorController" styleClass="dialog">