Changed new editor icon

DJ-Raven · DJ-Raven · commit 6422f5cffcd9 · 2025-07-31T17:40:38.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - DatePicker:
     - Add global `DatePicker.defaultMonths` for change the default label months (issue #24) and (PR #23)
 
+### Changed
+
+- Changed new datepicker and timepicker editor icon
+
 ### Fixed bugs
 
 - DatePicker:
diff --git a/src/main/java/raven/datetime/DatePicker.java b/src/main/java/raven/datetime/DatePicker.java
@@ -1,7 +1,6 @@
 package raven.datetime;
 
 import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.extras.FlatSVGIcon;
 import net.miginfocom.swing.MigLayout;
 import raven.datetime.component.PanelPopupEditor;
 import raven.datetime.component.date.*;
@@ -16,6 +15,7 @@
 import raven.datetime.swing.slider.SliderTransition;
 import raven.datetime.util.InputUtils;
 import raven.datetime.util.InputValidationListener;
+import raven.datetime.util.Utils;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -563,7 +563,7 @@ private void updateSelected() {
     private void installEditor(JFormattedTextField editor) {
         if (editor != null) {
             JToolBar toolBar = new JToolBar();
-            editorButton = new JButton(editorIcon != null ? editorIcon : new FlatSVGIcon("raven/datetime/icon/calendar.svg", 0.8f));
+            editorButton = new JButton(editorIcon != null ? editorIcon : Utils.createIcon("raven/datetime/icon/calendar.svg", 0.38f));
             toolBar.add(editorButton);
             editorButton.addActionListener(e -> {
                 if (editor.isEnabled()) {
diff --git a/src/main/java/raven/datetime/TimePicker.java b/src/main/java/raven/datetime/TimePicker.java
@@ -1,7 +1,6 @@
 package raven.datetime;
 
 import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.extras.FlatSVGIcon;
 import net.miginfocom.swing.MigLayout;
 import raven.datetime.component.PanelPopupEditor;
 import raven.datetime.component.time.Header;
@@ -14,6 +13,7 @@
 import raven.datetime.event.TimeSelectionListener;
 import raven.datetime.util.InputUtils;
 import raven.datetime.util.InputValidationListener;
+import raven.datetime.util.Utils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -230,7 +230,7 @@ public void removeTimeSelectionListener(TimeSelectionListener listener) {
 
     private void installEditor(JFormattedTextField editor) {
         JToolBar toolBar = new JToolBar();
-        editorButton = new JButton(editorIcon != null ? editorIcon : new FlatSVGIcon("raven/datetime/icon/clock.svg", 0.8f));
+        editorButton = new JButton(editorIcon != null ? editorIcon : Utils.createIcon("raven/datetime/icon/clock.svg", 0.38f));
         toolBar.add(editorButton);
         editorButton.addActionListener(e -> {
             if (editor.isEnabled()) {
diff --git a/src/main/java/raven/datetime/component/date/Header.java b/src/main/java/raven/datetime/component/date/Header.java
@@ -1,11 +1,11 @@
 package raven.datetime.component.date;
 
 import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.extras.FlatSVGIcon;
 import net.miginfocom.swing.MigLayout;
 import raven.datetime.DatePicker;
 import raven.datetime.component.date.event.DateControlEvent;
 import raven.datetime.component.date.event.DateControlListener;
+import raven.datetime.util.Utils;
 
 import javax.swing.*;
 
@@ -67,11 +67,11 @@ protected JButton createButton() {
     }
 
     protected Icon createDefaultBackIcon() {
-        return new FlatSVGIcon("raven/datetime/icon/back.svg");
+        return Utils.createIcon("raven/datetime/icon/back.svg", 1f);
     }
 
     protected Icon createDefaultForwardIcon() {
-        return new FlatSVGIcon("raven/datetime/icon/forward.svg");
+        return Utils.createIcon("raven/datetime/icon/forward.svg", 1f);
     }
 
     public void addDateControlListener(DateControlListener listener) {
diff --git a/src/main/java/raven/datetime/util/Utils.java b/src/main/java/raven/datetime/util/Utils.java
@@ -1,6 +1,7 @@
 package raven.datetime.util;
 
 import com.formdev.flatlaf.FlatLaf;
+import com.formdev.flatlaf.extras.FlatSVGIcon;
 import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.formdev.flatlaf.util.ColorFunctions;
 import com.formdev.flatlaf.util.UIScale;
@@ -36,4 +37,8 @@ public static Color getColor(Color color, boolean press, boolean hover) {
         }
         return color;
     }
+
+    public static Icon createIcon(String icon, float scale) {
+        return new FlatSVGIcon(icon, scale).setColorFilter(new FlatSVGIcon.ColorFilter((component, color) -> UIManager.getColor("Actions.Grey")));
+    }
 }
diff --git a/src/main/resources/raven/datetime/icon/calendar.svg b/src/main/resources/raven/datetime/icon/calendar.svg
@@ -1,10 +1,3 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="24" height="24">
-  <path fill="#CFD8DC" d="M5,38V14h38v24c0,2.2-1.8,4-4,4H9C6.8,42,5,40.2,5,38z" />
-  <path fill="#F44336" d="M43,10v6H5v-6c0-2.2,1.8-4,4-4h30C41.2,6,43,7.8,43,10z" />
-  <path fill="#B71C1C" d="M33 7A3 3 0 1 0 33 13 3 3 0 1 0 33 7zM15 7A3 3 0 1 0 15 13 3 3 0 1 0 15 7z" />
-  <path fill="#B0BEC5" d="M33 3c-1.1 0-2 .9-2 2v5c0 1.1.9 2 2 2s2-.9 2-2V5C35 3.9 34.1 3 33 3zM15 3c-1.1 0-2 .9-2 2v5c0 1.1.9 2 2 2s2-.9 2-2V5C17 3.9 16.1 3 15 3z" />
-  <g>
-    <path fill="#90A4AE" d="M13 20H17V24H13zM19 20H23V24H19zM25 20H29V24H25zM31 20H35V24H31zM13 26H17V30H13zM19 26H23V30H19zM25 26H29V30H25zM31 26H35V30H31zM13 32H17V36H13zM19 32H23V36H19zM25 32H29V36H25zM31 32H35V36H31z" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48">
+  <path d="M12.5 6C8.9280619 6 6 8.9280619 6 12.5L6 35.5C6 39.071938 8.9280619 42 12.5 42L35.5 42C39.071938 42 42 39.071938 42 35.5L42 12.5C42 8.9280619 39.071938 6 35.5 6L12.5 6 z M 12.5 9L35.5 9C37.450062 9 39 10.549938 39 12.5L39 14L9 14L9 12.5C9 10.549938 10.549938 9 12.5 9 z M 9 17L39 17L39 35.5C39 37.450062 37.450062 39 35.5 39L12.5 39C10.549938 39 9 37.450062 9 35.5L9 17 z M 15.5 21 A 2.5 2.5 0 0 0 15.5 26 A 2.5 2.5 0 0 0 15.5 21 z M 24 21 A 2.5 2.5 0 0 0 24 26 A 2.5 2.5 0 0 0 24 21 z M 32.5 21 A 2.5 2.5 0 0 0 32.5 26 A 2.5 2.5 0 0 0 32.5 21 z M 15.5 30 A 2.5 2.5 0 0 0 15.5 35 A 2.5 2.5 0 0 0 15.5 30 z M 24 30 A 2.5 2.5 0 0 0 24 35 A 2.5 2.5 0 0 0 24 30 z" fill="#969696" />
 </svg>
diff --git a/src/main/resources/raven/datetime/icon/clock.svg b/src/main/resources/raven/datetime/icon/clock.svg
@@ -1,10 +1,3 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="24" height="24">
-  <path fill="#00acc1" d="M44,24c0,11.044-8.956,20-20,20S4,35.044,4,24S12.956,4,24,4S44,12.956,44,24z" />
-  <path fill="#eee" d="M40,24c0,8.838-7.162,16-16,16S8,32.838,8,24S15.163,8,24,8S40,15.163,40,24z" />
-  <path fill="#78909c" d="M23 39.95C23.332 39.97 23.662 40 24 40s.668-.03 1-.05V36h-2V39.95zM36 25h3.95C39.97 24.668 40 24.338 40 24s-.03-.668-.05-1H36V25zM8.05 25H12v-2H8.05C8.03 23.332 8 23.662 8 24S8.03 24.668 8.05 25z" />
-  <path d="M31.664,30.27L29.934,32l-6.797-6.797l1.73-1.73L31.664,30.27z" />
-  <path d="M27,24c0,1.656-1.344,3-3,3s-3-1.344-3-3s1.344-3,3-3S27,22.344,27,24" />
-  <path d="M23,11h2v10.336h-2V11z" />
-  <path fill="#00acc1" d="M25,24c0,0.551-0.449,1-1,1s-1-0.449-1-1s0.449-1,1-1S25,23.449,25,24" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+  <path d="M24 4C12.972066 4 4 12.972074 4 24C4 35.027926 12.972066 44 24 44C35.027934 44 44 35.027926 44 24C44 12.972074 35.027934 4 24 4 z M 24 7C33.406615 7 41 14.593391 41 24C41 33.406609 33.406615 41 24 41C14.593385 41 7 33.406609 7 24C7 14.593391 14.593385 7 24 7 z M 22.476562 11.978516 A 1.50015 1.50015 0 0 0 21 13.5L21 24.5 A 1.50015 1.50015 0 0 0 21.439453 25.560547L26.439453 30.560547 A 1.50015 1.50015 0 1 0 28.560547 28.439453L24 23.878906L24 13.5 A 1.50015 1.50015 0 0 0 22.476562 11.978516 z" fill="#969696" />
 </svg>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package raven.datetime.util;`
`2`	`2`
`3`	`3`	`import com.formdev.flatlaf.FlatLaf;`
	`4`	`+import com.formdev.flatlaf.extras.FlatSVGIcon;`
`4`	`5`	`import com.formdev.flatlaf.ui.FlatUIUtils;`
`5`	`6`	`import com.formdev.flatlaf.util.ColorFunctions;`
`6`	`7`	`import com.formdev.flatlaf.util.UIScale;`
`@@ -36,4 +37,8 @@ public static Color getColor(Color color, boolean press, boolean hover) {`
`36`	`37`	`}`
`37`	`38`	`return color;`
`38`	`39`	`}`
	`40`	`+`
	`41`	`+ public static Icon createIcon(String icon, float scale) {`
	`42`	`+ return new FlatSVGIcon(icon, scale).setColorFilter(new FlatSVGIcon.ColorFilter((component, color) -> UIManager.getColor("Actions.Grey")));`
	`43`	`+ }`
`39`	`44`	`}`