支持设置小数边框厚度

xuanxuqaq · xuanxuqaq · commit 295260424e7d · 2023-02-02T21:38:07.000+08:00
diff --git a/src/main/java/file/engine/MainClass.java b/src/main/java/file/engine/MainClass.java
@@ -169,6 +169,8 @@ private static void checkVersion() {
      * -DFile_Engine_Preview=true
      */
     private static void setSystemProperties() {
+        System.setProperty("awt.useSystemAAFontSettings", "on");
+        System.setProperty("swing.aatext", "true");
         System.setProperty("File_Engine_Preview", "false");
         System.setProperty("file.encoding", "UTF-8");
         System.setProperty("sun.java2d.noddraw", "true");
diff --git a/src/main/java/file/engine/configs/AllConfigs.java b/src/main/java/file/engine/configs/AllConfigs.java
@@ -430,7 +430,8 @@ private void readSearchBarFontColor(Map<String, Object> settingsInJson) {
     }
 
     private void readBorderThickness(Map<String, Object> settingsInJson) {
-        configEntity.setBorderThickness(getFromJson(settingsInJson, "borderThickness", 1));
+        Object borderThickness = getFromJson(settingsInJson, "borderThickness", 1);
+        configEntity.setBorderThickness(Float.parseFloat(String.valueOf(borderThickness)));
     }
 
     private void readLanguage(Map<String, Object> settingsInJson) {
diff --git a/src/main/java/file/engine/configs/ConfigEntity.java b/src/main/java/file/engine/configs/ConfigEntity.java
@@ -99,7 +99,7 @@ public class ConfigEntity {
     private String borderType;
 
     @SerializedName("borderThickness")
-    private int borderThickness;
+    private float borderThickness;
 
     @SerializedName("roundRadius")
     private double roundRadius;
diff --git a/src/main/java/file/engine/event/handler/impl/frame/searchBar/PreviewSearchBarEvent.java b/src/main/java/file/engine/event/handler/impl/frame/searchBar/PreviewSearchBarEvent.java
@@ -12,7 +12,7 @@ public class PreviewSearchBarEvent extends Event {
     public final int unchosenLabelFontColor;
     public final int defaultBackgroundColor;
     public final Constants.Enums.BorderType borderType;
-    public final int borderThickness;
+    public final float borderThickness;
 
     public PreviewSearchBarEvent(String borderColor,
                                  String searchBarColor,
@@ -31,7 +31,7 @@ public PreviewSearchBarEvent(String borderColor,
         this.chosenLabelFontColor = Integer.parseInt(chosenLabelFontColor, 16);
         this.unchosenLabelFontColor = Integer.parseInt(unchosenLabelFontColor, 16);
         this.defaultBackgroundColor = Integer.parseInt(defaultBackgroundColor, 16);
-        this.borderThickness = Integer.parseInt(borderThickness);
+        this.borderThickness = Float.parseFloat(borderThickness);
         this.borderType = borderType;
     }
 }
diff --git a/src/main/java/file/engine/frames/SearchBar.java b/src/main/java/file/engine/frames/SearchBar.java
@@ -188,18 +188,16 @@ private SearchBar() {
      * @param positionY        Y坐标
      * @param searchBarWidth   宽度
      * @param searchBarHeight  高度
-     * @param transparentColor 透明的背景颜色
-     * @param contentPanel     内容面板
      */
-    private void initFrame(int positionX, int positionY, int searchBarWidth, int searchBarHeight, Color transparentColor, JPanel contentPanel) {
+    private void initFrame(int positionX, int positionY, int searchBarWidth, int searchBarHeight) {
         //frame
         searchBar.setBounds(positionX, positionY, searchBarWidth, searchBarHeight);
         searchBar.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
         searchBar.setUndecorated(true);
         searchBar.getRootPane().setWindowDecorationStyle(JRootPane.NONE);
-        searchBar.setBackground(transparentColor);
+        searchBar.setBackground(new Color(0, 0, 0, 0));
         searchBar.setOpacity(AllConfigs.getInstance().getConfigEntity().getTransparency());
-        searchBar.setContentPane(contentPanel);
+        searchBar.setContentPane(searchBarContentPane);
         searchBar.setType(JFrame.Type.UTILITY);
         searchBar.setAlwaysOnTop(true);
         //用于C++判断是否点击了当前窗口
@@ -224,7 +222,7 @@ private void initGUI() {
         labelFontColor = new Color(configs.getFontColor());
         initBorder(allConfigs.getBorderType(), new Color(configs.getBorderColor()), configs.getBorderThickness());
 
-        initFrame(positionX, positionY, searchBarWidth, searchBarHeight, transparentColor, searchBarContentPane);
+        initFrame(positionX, positionY, searchBarWidth, searchBarHeight);
 
         int labelHeight = searchBarHeight / 9;
         int textFieldHeight = (int) (labelHeight * TEXT_FIELD_HEIGHT_RATIO);
@@ -263,6 +261,7 @@ private void initGUI() {
             searchBar.setIconImage(image);
         }
         //panel
+        searchBarContentPane.setDoubleBuffered(true);
         searchBarContentPane.setBounds(0, 0, searchBarWidth, searchBarHeight);
         searchBarContentPane.setLayout(null);
         searchBarContentPane.setBackground(transparentColor);
@@ -413,8 +412,9 @@ private void initMenuItems() {
      * @param borderColor     边框颜色
      * @param borderThickness 边框厚度
      */
-    private void initBorder(Constants.Enums.BorderType borderType, Color borderColor, int borderThickness) {
+    private void initBorder(Constants.Enums.BorderType borderType, Color borderColor, float borderThickness) {
         double roundRadius = AllConfigs.getInstance().getConfigEntity().getRoundRadius();
+        int borderThickNessInt = (int) borderThickness;
         RoundBorder topRound = new RoundBorder(borderColor,
                 borderThickness,
                 (int) roundRadius,
@@ -432,7 +432,7 @@ private void initBorder(Constants.Enums.BorderType borderType, Color borderColor
                 RoundBorder.ShowLines.ALL);
         if (Constants.Enums.BorderType.AROUND == borderType) {
             topBorder = topRound;
-            middleBorder = BorderFactory.createMatteBorder(0, borderThickness, 0, borderThickness, borderColor);
+            middleBorder = BorderFactory.createMatteBorder(0, borderThickNessInt, 0, borderThickNessInt, borderColor);
             bottomBorder = bottomRound;
             fullBorder = fullRound;
         } else if (Constants.Enums.BorderType.EMPTY == borderType) {
@@ -444,9 +444,9 @@ private void initBorder(Constants.Enums.BorderType borderType, Color borderColor
         } else if (borderType == Constants.Enums.BorderType.FULL) {
             Border lineBorder = BorderFactory.createMatteBorder(
                     0,
-                    borderThickness,
-                    borderThickness,
-                    borderThickness,
+                    borderThickNessInt,
+                    borderThickNessInt,
+                    borderThickNessInt,
                     borderColor);
             topBorder = topRound;
             middleBorder = lineBorder;
@@ -2588,6 +2588,9 @@ private void addSearchWaiter(AtomicBoolean isWaiting) {
     }
 
     private void setSearchBarRadius(int x, int y, double radius, int width, int height) {
+        Graphics g = searchBar.getGraphics();
+        Graphics2D graphics2d = (Graphics2D) g;
+        graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         searchBar.setShape(new RoundRectangle2D.Double(x, y, width, height, radius, radius));
     }
 
@@ -4397,7 +4400,7 @@ private void setSearchBarFontColor(int colorNum) {
         textField.setForeground(new Color(colorNum));
     }
 
-    private void setBorderColor(Constants.Enums.BorderType borderType, int colorNum, int borderThickness) {
+    private void setBorderColor(Constants.Enums.BorderType borderType, int colorNum, float borderThickness) {
         initBorder(borderType, new Color(colorNum), borderThickness);
     }
 }
diff --git a/src/main/java/file/engine/frames/SettingsFrame.java b/src/main/java/file/engine/frames/SettingsFrame.java
@@ -758,6 +758,19 @@ private boolean canParseInteger(String str, int min, int max) {
         }
     }
 
+    @SuppressWarnings("SameParameterValue")
+    private boolean canParseFloat(String str, float min, float max) {
+        try {
+            float v = Float.parseFloat(str);
+            if (min <= v && v <= max) {
+                return true;
+            }
+            throw new Exception("parse failed");
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     @SuppressWarnings("SameParameterValue")
     private boolean canParseDouble(String str, double min, double max) {
         try {
@@ -3221,7 +3234,7 @@ private void checkRoundRadius(StringBuilder stringBuilder) {
     }
 
     private void checkBorderThickness(StringBuilder stringBuilder) {
-        if (!canParseInteger(textFieldBorderThickness.getText(), 1, 4)) {
+        if (!canParseFloat(textFieldBorderThickness.getText(), 0, 4)) {
             stringBuilder.append(translateService.getTranslation("Border thickness is too large, please change"));
         }
     }
@@ -3340,7 +3353,7 @@ private ConfigEntity getConfigEntity(boolean isContinuousUpdate) {
             configEntity.setProxyType(Constants.Enums.ProxyType.PROXY_DIRECT);
         }
         configEntity.setUpdateAddress((String) chooseUpdateAddress.getSelectedItem());
-        configEntity.setBorderThickness(Integer.parseInt(textFieldBorderThickness.getText()));
+        configEntity.setBorderThickness(Float.parseFloat(textFieldBorderThickness.getText()));
         if (borderType == null) {
             borderType = Constants.Enums.BorderType.AROUND;
         }
diff --git a/src/main/java/file/engine/frames/components/RoundBorder.java b/src/main/java/file/engine/frames/components/RoundBorder.java
@@ -6,7 +6,7 @@
 
 public class RoundBorder implements Border {
     private final Color color;
-    private final int thickness;
+    private final float thickness;
     private final int borderRadius;
     private final int roundedCorners;
     private final int showLines;
@@ -84,7 +84,7 @@ private RoundShape(double width, double height, double radius, int roundedCorner
     }
 
 
-    public RoundBorder(Color color, int thickness, int roundRadius, int roundedCorners, int showLines) {
+    public RoundBorder(Color color, float thickness, int roundRadius, int roundedCorners, int showLines) {
         // 有参数的构造方法
         this.color = color;
         this.thickness = thickness;
@@ -104,7 +104,6 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
         graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         graphics2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_GASP);
         graphics2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
-        graphics2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         graphics2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
         graphics2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
         graphics2d.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,8 @@ private void readSearchBarFontColor(Map<String, Object> settingsInJson) {`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`private void readBorderThickness(Map<String, Object> settingsInJson) {`
`433`		`- configEntity.setBorderThickness(getFromJson(settingsInJson, "borderThickness", 1));`
	`433`	`+ Object borderThickness = getFromJson(settingsInJson, "borderThickness", 1);`
	`434`	`+ configEntity.setBorderThickness(Float.parseFloat(String.valueOf(borderThickness)));`
`434`	`435`	`}`
`435`	`436`
`436`	`437`	`private void readLanguage(Map<String, Object> settingsInJson) {`
Original file line number	Diff line number	Diff line change
`@@ -758,6 +758,19 @@ private boolean canParseInteger(String str, int min, int max) {`
`758`	`758`	`}`
`759`	`759`	`}`
`760`	`760`
	`761`	`+ @SuppressWarnings("SameParameterValue")`
	`762`	`+ private boolean canParseFloat(String str, float min, float max) {`
	`763`	`+ try {`
	`764`	`+ float v = Float.parseFloat(str);`
	`765`	`+ if (min <= v && v <= max) {`
	`766`	`+ return true;`
	`767`	`+ }`
	`768`	`+ throw new Exception("parse failed");`
	`769`	`+ } catch (Exception e) {`
	`770`	`+ return false;`
	`771`	`+ }`
	`772`	`+ }`
	`773`	`+`
`761`	`774`	`@SuppressWarnings("SameParameterValue")`
`762`	`775`	`private boolean canParseDouble(String str, double min, double max) {`
`763`	`776`	`try {`
`@@ -3221,7 +3234,7 @@ private void checkRoundRadius(StringBuilder stringBuilder) {`
`3221`	`3234`	`}`
`3222`	`3235`
`3223`	`3236`	`private void checkBorderThickness(StringBuilder stringBuilder) {`
`3224`		`- if (!canParseInteger(textFieldBorderThickness.getText(), 1, 4)) {`
	`3237`	`+ if (!canParseFloat(textFieldBorderThickness.getText(), 0, 4)) {`
`3225`	`3238`	`stringBuilder.append(translateService.getTranslation("Border thickness is too large, please change"));`
`3226`	`3239`	`}`
`3227`	`3240`	`}`
`@@ -3340,7 +3353,7 @@ private ConfigEntity getConfigEntity(boolean isContinuousUpdate) {`
`3340`	`3353`	`configEntity.setProxyType(Constants.Enums.ProxyType.PROXY_DIRECT);`
`3341`	`3354`	`}`
`3342`	`3355`	`configEntity.setUpdateAddress((String) chooseUpdateAddress.getSelectedItem());`
`3343`		`- configEntity.setBorderThickness(Integer.parseInt(textFieldBorderThickness.getText()));`
	`3356`	`+ configEntity.setBorderThickness(Float.parseFloat(textFieldBorderThickness.getText()));`
`3344`	`3357`	`if (borderType == null) {`
`3345`	`3358`	`borderType = Constants.Enums.BorderType.AROUND;`
`3346`	`3359`	`}`