From af14b6f9460aab7dab86917c154b17c85da34fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E8=BD=B2?= <luke.k.xu@hotmail.com>
Date: Sat, 19 Aug 2023 21:43:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8Acss=E6=94=BE=E5=88=B0css=E5=8C=85,?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4,=E4=BF=AE=E6=94=B9textarea=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.txt                                                 | 8 --------
 src/main/java/org/jcnc/jnotepad/LunchApp.java             | 2 +-
 .../org/jcnc/jnotepad/controller/manager/Controller.java  | 7 +------
 .../java/org/jcnc/jnotepad/ui/LineNumberTextArea.java     | 7 +++----
 src/main/resources/{ => css}/styles.css                   | 0
 tool/{package.txt => jpackage.txt}                        | 0
 6 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 build.txt
 rename src/main/resources/{ => css}/styles.css (100%)
 rename tool/{package.txt => jpackage.txt} (100%)

diff --git a/build.txt b/build.txt
deleted file mode 100644
index e8bad2c..0000000
--- a/build.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-jpackage `
-  --name JNotepad `
-  --type app-image `
-  -m org.jcnc.jnotepad/org.jcnc.jnotepad.LunchApp `
-  --runtime-image .\target\JNotepad\ `
-  --icon src/main/resources/img/icon.ico `
-  --app-version 1.1.9 `
-  --vendor "JCNC"
\ No newline at end of file
diff --git a/src/main/java/org/jcnc/jnotepad/LunchApp.java b/src/main/java/org/jcnc/jnotepad/LunchApp.java
index d3d4944..91fea40 100644
--- a/src/main/java/org/jcnc/jnotepad/LunchApp.java
+++ b/src/main/java/org/jcnc/jnotepad/LunchApp.java
@@ -42,7 +42,7 @@ public class LunchApp extends Application {
 
         scene = new Scene(root, width, length);
         Application.setUserAgentStylesheet(new PrimerLight().getUserAgentStylesheet());
-        scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("/styles.css")).toExternalForm());
+        scene.getStylesheets().add(Objects.requireNonNull(getClass().getResource("/css/styles.css")).toExternalForm());
 
         primaryStage.setTitle(name);
         primaryStage.setWidth(width);
diff --git a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
index 9a19bd4..952042d 100644
--- a/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
+++ b/src/main/java/org/jcnc/jnotepad/controller/manager/Controller.java
@@ -5,16 +5,14 @@ import javafx.concurrent.Task;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.control.Tab;
-
-import javafx.scene.control.TextArea;
 import org.jcnc.jnotepad.Interface.ControllerInterface;
-import org.jcnc.jnotepad.ui.LineNumberTextArea;
 import org.jcnc.jnotepad.LunchApp;
 import org.jcnc.jnotepad.controller.event.handler.LineFeed;
 import org.jcnc.jnotepad.controller.event.handler.NewFile;
 import org.jcnc.jnotepad.controller.event.handler.OpenFile;
 import org.jcnc.jnotepad.controller.event.handler.SaveAsFile;
 import org.jcnc.jnotepad.tool.EncodingDetector;
+import org.jcnc.jnotepad.ui.LineNumberTextArea;
 import org.jcnc.jnotepad.view.manager.ViewManager;
 
 import java.io.*;
@@ -224,9 +222,6 @@ public class Controller implements ControllerInterface {
         return caretPosition - text.lastIndexOf("\n", caretPosition - 1);
     }
 
-    /**
-     * 初始化标签面板。
-     */
     /**
      * 初始化标签面板。
      */
diff --git a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
index bdaaa9e..de5225e 100644
--- a/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
+++ b/src/main/java/org/jcnc/jnotepad/ui/LineNumberTextArea.java
@@ -1,12 +1,9 @@
 package org.jcnc.jnotepad.ui;
 
 import javafx.beans.property.StringProperty;
-
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.BorderPane;
 
-import java.util.Objects;
-
 public class LineNumberTextArea extends BorderPane {
 
 
@@ -21,9 +18,10 @@ public class LineNumberTextArea extends BorderPane {
         lineNumberArea = new TextArea();
         lineNumberArea.setEditable(false);
         lineNumberArea.setPrefWidth(30);
+        mainTextArea.setStyle("-fx-border-color:white;-fx-background-color:white;");
+        lineNumberArea.setStyle("-fx-border-color:white;-fx-background-color:white;");
         // 设置显示滚动条样式类
         lineNumberArea.getStyleClass().add("text-line-number");
-        /*mainTextArea.getStyleClass().add("show-scrollbars"); */
         lineNumberArea.textProperty().addListener((observable, oldValue, newValue) -> updateLineNumberWidth());
         mainTextArea.textProperty().addListener((observable, oldValue, newValue) -> updateLineNumberArea());
 
@@ -86,3 +84,4 @@ public class LineNumberTextArea extends BorderPane {
         return mainTextArea;
     }
 }
+
diff --git a/src/main/resources/styles.css b/src/main/resources/css/styles.css
similarity index 100%
rename from src/main/resources/styles.css
rename to src/main/resources/css/styles.css
diff --git a/tool/package.txt b/tool/jpackage.txt
similarity index 100%
rename from tool/package.txt
rename to tool/jpackage.txt