From 19b434b7a849fe42d08ed8c92dc3b163353d154a Mon Sep 17 00:00:00 2001 From: Calboot Date: Mon, 24 Nov 2025 19:53:35 +0800 Subject: [PATCH 1/5] initial --- .../hmcl/ui/versions/ModUpdatesPage.java | 7 +- HMCL/src/main/resources/assets/css/root.css | 67 +++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java index 8b02ca9f85..fa6dcfb4a8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java @@ -81,15 +81,15 @@ public ModUpdatesPage(ModManager modManager, List update enabledColumn.setMinWidth(40); TableColumn fileNameColumn = new TableColumn<>(i18n("mods.check_updates.file")); - fileNameColumn.setPrefWidth(200); + fileNameColumn.setPrefWidth(180); setupCellValueFactory(fileNameColumn, ModUpdateObject::fileNameProperty); TableColumn currentVersionColumn = new TableColumn<>(i18n("mods.check_updates.current_version")); - currentVersionColumn.setPrefWidth(200); + currentVersionColumn.setPrefWidth(180); setupCellValueFactory(currentVersionColumn, ModUpdateObject::currentVersionProperty); TableColumn targetVersionColumn = new TableColumn<>(i18n("mods.check_updates.target_version")); - targetVersionColumn.setPrefWidth(200); + targetVersionColumn.setPrefWidth(180); setupCellValueFactory(targetVersionColumn, ModUpdateObject::targetVersionProperty); TableColumn sourceColumn = new TableColumn<>(i18n("mods.check_updates.source")); @@ -101,6 +101,7 @@ public ModUpdatesPage(ModManager modManager, List update TableView table = new TableView<>(objects); table.setEditable(true); table.getColumns().setAll(enabledColumn, fileNameColumn, currentVersionColumn, targetVersionColumn, sourceColumn); + setMargin(table, new Insets(8, 8, 5, 8)); setCenter(table); diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 0d7df39dbe..dec2bbb77f 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1485,3 +1485,70 @@ .html-italic { -fx-font-style: italic; } + +/******************************************************************************* + * * + * Table View * + * * + ******************************************************************************/ + +/* WE DEFINITELY NEED JFX TABLE-VIEW */ + +.table-view { + -fx-padding: 3; +} + +.table-view, +.table-view .column-header, +.table-view .filler, +.table-view .column-header-background, +.table-row-cell { + -fx-background-color: white; + -fx-background-radius: 6; + -fx-border-radius: 6; +} + +.table-row-cell { + -fx-background-color: rgba(0, 0, 0, 0.03); +} + +.table-row-cell:odd { + -fx-background-color: white; +} + +.table-cell { + -fx-background-color: transparent; + -fx-text-fill: rgba(0.0, 0.0, 0.0, 0.87); +} + +.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected { + -fx-background-color: derive(#9ec5fe, 40%); + -fx-table-cell-border-color: derive(#9ec5fe, 40%); +} + +.table-view > .virtual-flow > .scroll-bar:vertical { + -fx-skin: "org.jackhuang.hmcl.ui.construct.FloatScrollBarSkin"; +} + +.table-view > .virtual-flow > .scroll-bar:vertical .track { + -fx-fill: transparent; +} + +/******************************************************************************* + * * + * CheckBox * + * * + ******************************************************************************/ + +/* For CheckBoxTableCell in ModUpdatesPage */ + +.check-box .box { + -fx-background-color: transparent; + -fx-border-color: -fx-base-check-color; + -fx-border-width: 2; + -fx-border-radius: 3; +} + +.check-box:selected .box .mark { + -fx-background-color: -fx-base-check-color; +} From 5941547f2d00d715494e54be7cfa7b1edc7134c1 Mon Sep 17 00:00:00 2001 From: Calboot Date: Mon, 24 Nov 2025 21:11:43 +0800 Subject: [PATCH 2/5] update --- HMCL/src/main/resources/assets/css/root.css | 22 ++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index dec2bbb77f..5c4d6a0be8 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1503,17 +1503,29 @@ .table-view .filler, .table-view .column-header-background, .table-row-cell { - -fx-background-color: white; -fx-background-radius: 6; -fx-border-radius: 6; } +.table-view { + -fx-background-color: white; +} + +.table-view .column-header, +.table-view .filler { + -fx-background-color: transparent; +} + +.table-view .column-header-background { + -fx-background-color: rgba(0, 0, 0, 0.05); +} + .table-row-cell { - -fx-background-color: rgba(0, 0, 0, 0.03); + -fx-background-color: white; } .table-row-cell:odd { - -fx-background-color: white; + -fx-background-color: rgba(0, 0, 0, 0.03); } .table-cell { @@ -1526,11 +1538,11 @@ -fx-table-cell-border-color: derive(#9ec5fe, 40%); } -.table-view > .virtual-flow > .scroll-bar:vertical { +.table-view > .virtual-flow > .scroll-bar { -fx-skin: "org.jackhuang.hmcl.ui.construct.FloatScrollBarSkin"; } -.table-view > .virtual-flow > .scroll-bar:vertical .track { +.table-view > .virtual-flow > .scroll-bar .track { -fx-fill: transparent; } From 672c38a3172c0b4e5facc1281f5685ba4fb6814c Mon Sep 17 00:00:00 2001 From: Calboot Date: Sun, 30 Nov 2025 16:15:51 +0800 Subject: [PATCH 3/5] monet --- HMCL/src/main/resources/assets/css/root.css | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 869bbd02bd..750cc1ab97 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1633,7 +1633,7 @@ } .table-view { - -fx-background-color: white; + -fx-background-color: -monet-surface-container; } .table-view .column-header, @@ -1642,25 +1642,26 @@ } .table-view .column-header-background { - -fx-background-color: rgba(0, 0, 0, 0.05); + -fx-background-color: derive(-monet-surface-container, 20%); } .table-row-cell { - -fx-background-color: white; + -fx-background-color: -monet-surface-container; + -fx-table-cell-border-color: -monet-surface-container; } .table-row-cell:odd { - -fx-background-color: rgba(0, 0, 0, 0.03); + -fx-background-color: derive(-monet-surface-container, 20%); } .table-cell { -fx-background-color: transparent; - -fx-text-fill: rgba(0.0, 0.0, 0.0, 0.87); + -fx-text-fill: -monet-on-surface; } .table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected { - -fx-background-color: derive(#9ec5fe, 40%); - -fx-table-cell-border-color: derive(#9ec5fe, 40%); + -fx-background-color: -monet-secondary-container; + -fx-table-cell-border-color: -monet-secondary-container; } .table-view > .virtual-flow > .scroll-bar { @@ -1681,11 +1682,11 @@ .check-box .box { -fx-background-color: transparent; - -fx-border-color: -fx-base-check-color; + -fx-border-color: -monet-primary; -fx-border-width: 2; -fx-border-radius: 3; } .check-box:selected .box .mark { - -fx-background-color: -fx-base-check-color; + -fx-background-color: -monet-primary; } From 4933542e42d3baee6169f30c321575d7ca4a82ea Mon Sep 17 00:00:00 2001 From: Calboot Date: Sun, 30 Nov 2025 21:12:02 +0800 Subject: [PATCH 4/5] update --- HMCL/src/main/resources/assets/css/root.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 750cc1ab97..1d8b428f13 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1621,6 +1621,7 @@ .table-view { -fx-padding: 3; + -fx-background-color: -monet-surface-container-low; } .table-view, @@ -1632,26 +1633,22 @@ -fx-border-radius: 6; } -.table-view { - -fx-background-color: -monet-surface-container; -} - .table-view .column-header, .table-view .filler { -fx-background-color: transparent; } .table-view .column-header-background { - -fx-background-color: derive(-monet-surface-container, 20%); + -fx-background-color: -monet-surface-container-highest; } .table-row-cell { -fx-background-color: -monet-surface-container; - -fx-table-cell-border-color: -monet-surface-container; + -fx-table-cell-border-color: -monet-surface-container-lowest; } .table-row-cell:odd { - -fx-background-color: derive(-monet-surface-container, 20%); + -fx-background-color: -monet-surface-container-high; } .table-cell { @@ -1661,7 +1658,6 @@ .table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected { -fx-background-color: -monet-secondary-container; - -fx-table-cell-border-color: -monet-secondary-container; } .table-view > .virtual-flow > .scroll-bar { From f0c85aa7a808957ea4767cdf4cba0980cbf5eaab Mon Sep 17 00:00:00 2001 From: Calboot Date: Sun, 7 Dec 2025 17:59:03 +0800 Subject: [PATCH 5/5] update --- .../java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java index 7c7cc09fb1..782d76e92b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java @@ -101,7 +101,7 @@ public ModUpdatesPage(ModManager modManager, List update TableView table = new TableView<>(objects); table.setEditable(true); table.getColumns().setAll(enabledColumn, fileNameColumn, currentVersionColumn, targetVersionColumn, sourceColumn); - setMargin(table, new Insets(8, 8, 5, 8)); + setMargin(table, new Insets(10, 10, 5, 10)); setCenter(table);