From 60e4eb3f22348702a05288fd296bc97a4ec59c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E8=BD=B2?= Date: Thu, 31 Aug 2023 02:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=95=E9=83=A8=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../root/bottom/RootBottomSideBarVBox.java | 5 ++--- .../jnotepad/root/center/main/MainBorderPane.java | 7 +++---- .../main/bottom/status/JNotepadStatusBox.java | 15 ++++++++++++--- .../root/left/sidebar/RootLeftSideBarVBox.java | 5 ++--- .../jnotepad/root/right/RootRightSideBarVBox.java | 4 +--- .../jnotepad/root/top/RootTopSideBarVBox.java | 4 +--- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java index 60ba7f4..8a02199 100644 --- a/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/bottom/RootBottomSideBarVBox.java @@ -1,6 +1,6 @@ package org.jcnc.jnotepad.root.bottom; -import javafx.geometry.Insets; +import org.jcnc.jnotepad.root.center.main.bottom.status.JNotepadStatusBox; import org.jcnc.jnotepad.ui.module.AbstractVBox; public class RootBottomSideBarVBox extends AbstractVBox { @@ -12,8 +12,7 @@ public class RootBottomSideBarVBox extends AbstractVBox { } private void initSidebarVBox() { - setPadding(new Insets(10)); - setSpacing(10); + getChildren().addAll(JNotepadStatusBox.getInstance()); } public static RootBottomSideBarVBox getInstance() { diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java b/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java index 4dadde6..d6a32ac 100644 --- a/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/MainBorderPane.java @@ -1,6 +1,5 @@ package org.jcnc.jnotepad.root.center.main; -import org.jcnc.jnotepad.root.center.main.bottom.status.JNotepadStatusBox; import org.jcnc.jnotepad.root.center.main.center.tab.JNotepadTabPane; import org.jcnc.jnotepad.root.center.main.top.MainTopVBox; import org.jcnc.jnotepad.ui.module.AbstractBorderPane; @@ -14,11 +13,11 @@ public class MainBorderPane extends AbstractBorderPane { } private void initRootBorderPane() { - this.setBottomComponent(JNotepadStatusBox.getInstance()); + //setBottomComponent(JNotepadStatusBox.getInstance()); - this.setCenter(JNotepadTabPane.getInstance()); + setCenter(JNotepadTabPane.getInstance()); - this.setTopComponent(MainTopVBox.getInstance()); + setTopComponent(MainTopVBox.getInstance()); } public static MainBorderPane getInstance() { diff --git a/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java b/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java index 4e0c708..5c51410 100644 --- a/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/center/main/bottom/status/JNotepadStatusBox.java @@ -1,6 +1,7 @@ package org.jcnc.jnotepad.root.center.main.bottom.status; import javafx.geometry.Insets; +import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.control.TextArea; import org.jcnc.jnotepad.app.i18n.UiResourceBundle; @@ -46,6 +47,7 @@ public class JNotepadStatusBox extends AbstractHBox { * @since 2023/8/27 9:33 */ public void initStatusBox() { + this.getChildren().clear(); // 创建状态栏 statusLabel = new Label(); @@ -57,9 +59,16 @@ public class JNotepadStatusBox extends AbstractHBox { this.getChildren().add(statusLabel); this.getChildren().add(encodingLabel); this.getProperties().put("borderpane-margin", new Insets(5, 10, 5, 10)); - + this.setAlignment(Pos.BASELINE_RIGHT); UiResourceBundle.getInstance().addListener((observable, oldValue, newValue) -> updateWhenTabSelected()); + /* + 第一个参数 10 表示上边距。 + 第二个参数 10 表示右边距。 + 第三个参数 10 表示下边距。 + 第四个参数 10 表示左边距。 + */ + setMargin(statusLabel, new Insets(5, 10, 5, 10)); } public void updateEncodingLabel() { @@ -75,7 +84,7 @@ public class JNotepadStatusBox extends AbstractHBox { if (encoding == null) { encoding = Charset.defaultCharset().name(); } - this.encodingLabel.setText(getEncodingFormattedText(encoding)); + this.encodingLabel.setText(getEncodingFormattedText(encoding) + "\t"); } /** @@ -155,7 +164,7 @@ public class JNotepadStatusBox extends AbstractHBox { } protected String getEncodingFormattedText(String encoding) { - String encodingLabelFormat = "\t%s : %s"; + String encodingLabelFormat = "%s : %s"; return String.format(encodingLabelFormat, UiResourceBundle.getContent(TextConstants.ENCODE), encoding); } } diff --git a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java index 89da1ae..c9206ea 100644 --- a/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/left/sidebar/RootLeftSideBarVBox.java @@ -1,6 +1,5 @@ package org.jcnc.jnotepad.root.left.sidebar; -import javafx.geometry.Insets; import org.jcnc.jnotepad.ui.module.AbstractVBox; public class RootLeftSideBarVBox extends AbstractVBox { @@ -12,10 +11,10 @@ public class RootLeftSideBarVBox extends AbstractVBox { } private void initSidebarVBox() { - setPadding(new Insets(10)); - setSpacing(10); + } + public static RootLeftSideBarVBox getInstance() { return INSTANCE; } diff --git a/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java index f4d2782..72426fc 100644 --- a/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/right/RootRightSideBarVBox.java @@ -1,6 +1,5 @@ package org.jcnc.jnotepad.root.right; -import javafx.geometry.Insets; import org.jcnc.jnotepad.ui.module.AbstractVBox; public class RootRightSideBarVBox extends AbstractVBox { @@ -12,8 +11,7 @@ public class RootRightSideBarVBox extends AbstractVBox { } private void initSidebarVBox() { - setPadding(new Insets(10)); - setSpacing(10); + } public static RootRightSideBarVBox getInstance() { diff --git a/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java b/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java index c7ae955..fc9c90a 100644 --- a/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java +++ b/src/main/java/org/jcnc/jnotepad/root/top/RootTopSideBarVBox.java @@ -1,6 +1,5 @@ package org.jcnc.jnotepad.root.top; -import javafx.geometry.Insets; import org.jcnc.jnotepad.ui.module.AbstractVBox; public class RootTopSideBarVBox extends AbstractVBox { @@ -12,8 +11,7 @@ public class RootTopSideBarVBox extends AbstractVBox { } private void initSidebarVBox() { - setPadding(new Insets(10)); - setSpacing(10); + } public static RootTopSideBarVBox getInstance() {