From ccaebebaccaeaa90c5d3fe0431d665b5d523d6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=99=BD=E4=B8=8E=E5=AD=9F=E6=B5=A9=E7=84=B6?=
<1063889643@qq.com>
Date: Sat, 7 Oct 2023 13:06:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?#I806RZ=20state=20to=20=E5=B7=B2=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=20=E6=AD=A3=E5=9C=A8=E4=B8=8B=E8=BD=BD=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 5 ++
src/main/java/com/light/layout/MenuPane.java | 12 +--
src/main/java/module-info.java | 1 +
src/main/resources/css/menu.css | 78 ++++----------------
4 files changed, 29 insertions(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index 882fede..de51eb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,11 @@
ikonli-antdesignicons-pack
12.3.1
+
+ org.kordamp.ikonli
+ ikonli-bootstrapicons-pack
+ 12.3.1
+
diff --git a/src/main/java/com/light/layout/MenuPane.java b/src/main/java/com/light/layout/MenuPane.java
index 95bc348..a86297a 100644
--- a/src/main/java/com/light/layout/MenuPane.java
+++ b/src/main/java/com/light/layout/MenuPane.java
@@ -9,6 +9,7 @@ import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import org.kordamp.ikonli.antdesignicons.AntDesignIconsFilled;
import org.kordamp.ikonli.antdesignicons.AntDesignIconsOutlined;
+import org.kordamp.ikonli.bootstrapicons.BootstrapIcons;
import org.kordamp.ikonli.javafx.FontIcon;
import java.util.Optional;
@@ -26,9 +27,9 @@ public class MenuPane extends StackPane {
private final ListView dynamicMenu = new ListView<>();
// 底部导航栏
- private final Label userLabel = new Label("test");
- private final Label emailLabel = new Label("test@163.com");
- private final VBox bottomMenu = new VBox(userLabel, emailLabel);
+ private final Label downloadLabel = new Label("正在下载", new FontIcon(BootstrapIcons.ARROW_DOWN));
+ private final Label updateLabel = new Label("正在更新", new FontIcon(BootstrapIcons.ARROW_DOWN));
+ private final VBox bottomMenu = new VBox(downloadLabel, updateLabel);
private VBox asideContainer = new VBox(topMenu, new Separator(Orientation.HORIZONTAL), dynamicMenu, new Separator(Orientation.HORIZONTAL), bottomMenu);
@@ -56,8 +57,9 @@ public class MenuPane extends StackPane {
// 添加样式
this.asideContainer.getStyleClass().add("aside");
this.dynamicMenu.getStyleClass().add("menu");
- this.userLabel.getStyleClass().add("user-label");
- this.emailLabel.getStyleClass().add("email-label");
+ this.bottomMenu.getStyleClass().add("down-update");
+ this.downloadLabel.getStyleClass().add("download-label");
+ this.updateLabel.getStyleClass().add("update-label");
// 加上监听
dynamicMenu.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index fbb190d..f359b55 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -10,4 +10,5 @@ open module com.leo {
requires org.kordamp.ikonli.javafx;
requires org.jetbrains.annotations;
requires org.kordamp.ikonli.antdesignicons;
+ requires org.kordamp.ikonli.bootstrapicons;
}
diff --git a/src/main/resources/css/menu.css b/src/main/resources/css/menu.css
index 72b0fa2..2d35487 100644
--- a/src/main/resources/css/menu.css
+++ b/src/main/resources/css/menu.css
@@ -85,72 +85,26 @@
-fx-icon-color: -cf-primary-color;
}
-.user-label, .email-label {
- -fx-font-size: 13px;
- -fx-font-weight: bolder;
- -fx-text-fill: -cf-text-color;
-}
-
-.email-label {
- -fx-font-weight: lighter;
- -fx-text-fill: derive(-cf-text-color, 40%);
-}
-
-/* 滚动条样式 */
-.scroll-bar-style {
- -fx-background-color: transparent;
-}
-
-.scroll-bar-style > .viewport {
- -fx-background-color: transparent;
-}
-
-.scroll-bar-style .scroll-bar {
- /*-fx-block-increment:10000;*/
- -fx-unit-increment: 20;
- -fx-background-color: transparent;
-}
-
-.scroll-bar-style .scroll-bar > .decrement-button > .decrement-arrow,
-.scroll-bar-style .scroll-bar > .increment-button > .increment-arrow {
- -fx-background-color: transparent;
-}
-
-.scroll-bar-style .scroll-bar:vertical > .decrement-button,
-.scroll-bar-style .scroll-bar:vertical > .increment-button {
- -fx-pref-height: 0px;
- -fx-pref-width: 0.01px;
-}
-
-.scroll-bar-style .scroll-bar:horizontal > .decrement-button,
-.scroll-bar-style .scroll-bar:horizontal > .increment-button {
- -fx-pref-width: 0px;
- -fx-pref-height: 0.01px;
-}
-
-.scroll-bar-style .scroll-bar > .track {
- -fx-background-radius: 0px;
- -fx-background-color: transparent;
-}
-
-.scroll-bar-style .scroll-bar:vertical > .thumb, .scroll-bar-style .scroll-bar:horizontal > .thumb {
- -fx-background-color: rgba(0, 0, 0, 0.2);
- -fx-background-insets: 0px;
- -fx-background-radius: 3px;
-}
-
-.scroll-bar-style .scroll-bar:vertical {
- -fx-padding: 6px 0px 6px 0px;
+/*正在下载，正在更新box*/
+.down-update {
+ -fx-alignment: center-left;
+ -fx-spacing: 10px;
+ -fx-padding: 0 10px;
+ -fx-min-height: 40px;
+ -fx-pref-height: 40px;
}
-.scroll-bar-style .scroll-bar:horizontal {
- -fx-padding: 0px 6px 0px 6px;
+.download-label, .update-label {
+ -fx-font-size: 14px;
+ -fx-text-fill: -cf-text-color;
}
-.scroll-bar-style .scroll-bar:vertical > .thumb, .scroll-bar-style .scroll-bar:vertical > .track {
- -fx-background-insets: 0px 0px 0px -6px;
+.download-label > .ikonli-font-icon {
+ -fx-icon-size: 14px;
+ -fx-icon-color: -cf-primary-color;
}
-.scroll-bar-style .scroll-bar:horizontal > .thumb, .scroll-bar-style .scroll-bar:horizontal > .track {
- -fx-background-insets: -6px 0px 0px 0px;
+.update-label > .ikonli-font-icon {
+ -fx-icon-size: 14px;
+ -fx-icon-color: -cf-success-color;
}
\ No newline at end of file
--
Gitee
From e218c0fb04712e81c6cf0e23c187ccf129cec24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=99=BD=E4=B8=8E=E5=AD=9F=E6=B5=A9=E7=84=B6?=
<1063889643@qq.com>
Date: Sat, 7 Oct 2023 13:50:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?#I806RZ=20state=20to=20=E5=B7=B2=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=20=E8=AE=BE=E7=BD=AE=E7=AA=97=E4=BD=93=E6=9C=80?=
=?UTF-8?q?=E5=B0=8F=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/light/GitManagerApp.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/light/GitManagerApp.java b/src/main/java/com/light/GitManagerApp.java
index 6cccd4f..d7a0f56 100644
--- a/src/main/java/com/light/GitManagerApp.java
+++ b/src/main/java/com/light/GitManagerApp.java
@@ -40,8 +40,10 @@ public class GitManagerApp extends Application {
NodeUtils.setAnchors(root, Insets.EMPTY);
// 场景
- Scene scene = new Scene(root, 1000, 600);
+ Scene scene = new Scene(root);
stage.setTitle("Git批量管理工具");
+ stage.setMinWidth(1100);
+ stage.setMinHeight(650);
stage.getIcons().add(new Image(this.getClass().getResource("/icons/git.png").toExternalForm()));
stage.setScene(scene);
stage.show();
--
Gitee
From 8e780930a3afa7be13ed16c6a39df5fa4d8065fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=99=BD=E4=B8=8E=E5=AD=9F=E6=B5=A9=E7=84=B6?=
<1063889643@qq.com>
Date: Sat, 7 Oct 2023 14:13:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?#I806RZ=20state=20to=20=E5=B7=B2=E5=AE=8C?=
=?UTF-8?q?=E6=88=90=20=E8=B7=9F=E9=9A=8F=E7=AA=97=E4=BD=93=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E4=BC=B8=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/light/GitManagerApp.java | 3 ++-
src/main/java/com/light/layout/MenuPane.java | 4 +++-
src/main/resources/css/menu.css | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/light/GitManagerApp.java b/src/main/java/com/light/GitManagerApp.java
index d7a0f56..9ca0696 100644
--- a/src/main/java/com/light/GitManagerApp.java
+++ b/src/main/java/com/light/GitManagerApp.java
@@ -11,6 +11,7 @@ import javafx.scene.image.Image;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
+import javafx.scene.layout.StackPane;
import javafx.stage.Stage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,7 +26,7 @@ public class GitManagerApp extends Application {
Application.setUserAgentStylesheet(new PrimerLight().getUserAgentStylesheet());
// 根节点
- AnchorPane root = new AnchorPane();
+ StackPane root = new StackPane();
// 左右布局
HBox container = new HBox();
diff --git a/src/main/java/com/light/layout/MenuPane.java b/src/main/java/com/light/layout/MenuPane.java
index a86297a..f2cd33c 100644
--- a/src/main/java/com/light/layout/MenuPane.java
+++ b/src/main/java/com/light/layout/MenuPane.java
@@ -39,18 +39,20 @@ public class MenuPane extends StackPane {
this.contentPane = contentPane;
initialize();
- // 模拟数据
+ // 菜单栏标题
dynamicMenu.getItems().addAll(
new NavItem(new FontIcon(AntDesignIconsOutlined.HOME), "首页", null),
new NavItem(new FontIcon(AntDesignIconsOutlined.PARTITION), "管理", null),
new NavItem(new FontIcon(AntDesignIconsOutlined.EDIT), "笔记", null)
);
+ dynamicMenu.getSelectionModel().selectFirst();
}
private void initialize() {
// 加载样式
getStylesheets().add(STYLE_SHEET);
+ // 添加侧边栏，设置menu菜单自动伸缩
getChildren().addAll(asideContainer);
VBox.setVgrow(dynamicMenu, Priority.ALWAYS);
diff --git a/src/main/resources/css/menu.css b/src/main/resources/css/menu.css
index 2d35487..e11cca9 100644
--- a/src/main/resources/css/menu.css
+++ b/src/main/resources/css/menu.css
@@ -3,7 +3,7 @@
.aside {
/*-fx-min-width: 220px;
-fx-max-width: 220px;*/
- -fx-pref-width: 220px;
+ -fx-pref-width: 200px;
-fx-border-width: 0 1px 0 0;
-fx-border-color: -cf-border-color;
-fx-spacing: 5px;
--
Gitee