diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index 7158afe..9d211f6 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -84,7 +84,7 @@ public class Main extends Application { loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml")); pane = (AnchorPane) loader.load(); primaryStage.setMinHeight(600.00); - primaryStage.setMinWidth(950.00); + primaryStage.setMinWidth(1000.00); primaryStage.setResizable(false); primaryStage.setTitle("Project HomeFlix"); primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/icons/Homeflix_Icon_64x64.png"))); //adds application icon diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index 8210b34..e0ccb31 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -231,9 +231,9 @@ public class MainWindowController { private static final Logger LOGGER = LogManager.getLogger(MainWindowController.class.getName()); private int hashA = -647380320; - private String version = "0.5.99"; - private String buildNumber = "137"; - private String versionName = "solidify cow"; + private String version = "0.6.0"; + private String buildNumber = "141"; + private String versionName = "plasma vampire"; private String dialogBtnStyle; private String color; private String title; @@ -303,10 +303,10 @@ public class MainWindowController { // film Table columnStreamUrl.setMaxWidth(0); - columnTitle.setMaxWidth(215); - columnFavorite.setMaxWidth(60); - columnSeason.setMaxWidth(55); - columnEpisode.setMaxWidth(64); + columnTitle.setMaxWidth(190); + columnFavorite.setMaxWidth(80); + columnSeason.setMaxWidth(73); + columnEpisode.setMaxWidth(77); columnFavorite.setStyle("-fx-alignment: CENTER;"); filmsTreeTable.setRoot(filmRoot); @@ -441,6 +441,7 @@ public class MainWindowController { /** * FIXME fix bug when sort by ASCENDING, wrong order + * FIXME when sorting, series are expanded */ columnFavorite.sortTypeProperty().addListener(new ChangeListener() { @Override diff --git a/src/main/resources/css/MainWindow.css b/src/main/resources/css/MainWindow.css index 8c439c1..92eccee 100644 --- a/src/main/resources/css/MainWindow.css +++ b/src/main/resources/css/MainWindow.css @@ -10,4 +10,100 @@ .jfx-hamburgerB StackPane { -fx-background-color: black; -fx-background-radius: 5px; - } \ No newline at end of file +} + +/* + * TREE TABLE CSS + */ + +.tree-table-view { + -fx-tree-table-color: rgba(0, 168, 204, 0.2); + -fx-tree-table-rippler-color: rgba(0, 168, 204, 0.4); +} + +.tree-table-view:focused .tree-table-row-cell:selected { + -fx-background-color: -fx-tree-table-color; + -fx-table-cell-border-color: -fx-tree-table-color; + -fx-text-fill: BLACK; +} + +.tree-table-view:focused .tree-table-row-cell:selected .tree-table-cell { + -fx-text-fill: BLACK; +} + +.tree-table-view .jfx-rippler { + -jfx-rippler-fill: -fx-tree-table-rippler-color; +} + +.tree-table-view .column-header, +.tree-table-view .column-header-background, +.tree-table-view .column-header-background .filler { + -fx-background-color: TRANSPARENT; +} + +.tree-table-view .column-header { + -fx-border-width: 0 1 0 1; + -fx-border-color: #F3F3F3; +} + +.tree-table-view .column-header .label { + -fx-text-fill: #000000; + -fx-padding: 12 0 12 0; +} + +.tree-table-view .column-header .arrow, .tree-table-view .column-header .sort-order-dot { + -fx-background-color: #000000; +} + +.tree-table-view .column-header:last-visible { + -fx-border-width: 0 2 0 1; +} + +.tree-table-view .column-header-background { + -fx-border-width: 0 0.0 1 0; + -fx-border-color: #F3F3F3; +} + +.tree-table-view .tree-table-cell { + -fx-border-width: 0 0 0 0; + -fx-padding: 12 4 8 4; +} + +.tree-table-view .column-overlay { + -fx-background-color: -fx-tree-table-color; +} + +.tree-table-view .column-resize-line, .tree-table-view .column-drag-header { + -fx-background-color: -fx-tree-table-rippler-color; +} + +.tree-table-view:focused { + -fx-background-color: -fx-tree-table-color, -fx-box-border, -fx-control-inner-background; + -fx-background-insets: -1.4, 0, 1; + -fx-background-radius: 1.4, 0, 0; + -fx-padding: 1; /* 0.083333em; */ +} + +/* + * ChoiceBox + */ + +.choice-box { + -fx-background-color: transparent; + -fx-border-color: #000000; + -fx-border-width: 0 0 1 0; + -fx-background-radius: 0; + -fx-border-radius: 0; +} + +.choice-box:focused { + -fx-border-color: #9E9E9E; +} + +.choice-box>.open-button>.arrow { + -fx-background-color: #757575; +} + +.menu-item:focused { + -fx-background-color: #EE3523; +} \ No newline at end of file diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index bcc6b51..cec24f0 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -22,14 +22,14 @@ - + - + - + @@ -38,7 +38,7 @@ - + @@ -119,7 +119,7 @@ - +