From ba5172d78e45b2cede4f843ee0c6c2a66528b9c2 Mon Sep 17 00:00:00 2001 From: songdragon Date: Wed, 30 Aug 2023 22:23:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E6=97=B6tab=20tilte=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/event/handler/menuBar/RenameFile.java | 6 ++++-- src/main/resources/css/styles.css | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java index e75e66f..95e27b8 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java @@ -56,8 +56,7 @@ public class RenameFile implements EventHandler { // 如果当前不是关联文件则重命名标签页 else { TextField textField = new TextField(jnotepadtab.getText()); - // 设置文本框尺寸 - textField.setPrefSize(120, 12); + textField.getStyleClass().add("tab-title-editable"); // 清空标签页名称 jnotepadtab.setText(""); // 监听 Enter 键,完成编辑 @@ -83,6 +82,9 @@ public class RenameFile implements EventHandler { jnotepadtab.setClosable(false); // 设置 TextField 作为标签页的图形 jnotepadtab.setGraphic(textField); + // 默认获取焦点并选中所有文字 + textField.requestFocus(); + textField.selectAll(); } } diff --git a/src/main/resources/css/styles.css b/src/main/resources/css/styles.css index 695b475..a0db8d3 100644 --- a/src/main/resources/css/styles.css +++ b/src/main/resources/css/styles.css @@ -24,4 +24,13 @@ .main-text-area { -fx-border-color: white; -fx-background-color: white; +} + +/* tab修改标签样式 */ +.tab-title-editable { + -fx-fx-border-width: 0; + -fx-max-width: 80px; + -fx-max-height: 30px; + -fx-font-size: 14px; + -fx-padding: 2px 2px 2px 2px; } \ No newline at end of file From 3f7dbd7cd5e071698c15e1cc5576de3908df89bd Mon Sep 17 00:00:00 2001 From: songdragon Date: Wed, 30 Aug 2023 22:37:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E9=87=8D=E5=A4=8D=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=8D=E4=BC=9A=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnotepad/controller/event/handler/menuBar/RenameFile.java | 2 +- src/main/resources/css/styles.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java index 95e27b8..4165a66 100644 --- a/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java +++ b/src/main/java/org/jcnc/jnotepad/controller/event/handler/menuBar/RenameFile.java @@ -24,7 +24,7 @@ public class RenameFile implements EventHandler { public void handle(ActionEvent actionEvent) { // 获取当前标签页 JNotepadTab jnotepadtab = UiUtil.getJnotepadtab(); - if (jnotepadtab == null) { + if (jnotepadtab == null || jnotepadtab.getText().isEmpty()) { return; } // 判断当前是否为关联文件 diff --git a/src/main/resources/css/styles.css b/src/main/resources/css/styles.css index a0db8d3..de852e7 100644 --- a/src/main/resources/css/styles.css +++ b/src/main/resources/css/styles.css @@ -30,7 +30,7 @@ .tab-title-editable { -fx-fx-border-width: 0; -fx-max-width: 80px; - -fx-max-height: 30px; + -fx-max-height: 20px; -fx-font-size: 14px; -fx-padding: 2px 2px 2px 2px; } \ No newline at end of file