Application: Fix default theme; fix text antialiasing in custom controls

ShadelessFox · Jun 23, 2024 · 0095f26 · 0095f26
1 parent 9100c02
commit 0095f26
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/modules/decima-ui/src/main/java/com/shade/decima/ui/ApplicationSettings.java b/modules/decima-ui/src/main/java/com/shade/decima/ui/ApplicationSettings.java
@@ -1,5 +1,6 @@
 package com.shade.decima.ui;
 
+import com.formdev.flatlaf.FlatLightLaf;
 import com.shade.platform.model.Service;
 import com.shade.platform.model.app.ApplicationManager;
 import com.shade.platform.model.messages.Topic;
@@ -13,7 +14,7 @@
 public class ApplicationSettings implements PersistableComponent<ApplicationSettings> {
     public static final Topic<ApplicationSettingsChangeListener> SETTINGS = Topic.create("application settings", ApplicationSettingsChangeListener.class);
 
-    public String themeClassName;
+    public String themeClassName = FlatLightLaf.class.getName();
     public String customFontFamily;
     public int customFontSize;
 

diff --git a/modules/platform-ui/src/main/java/com/shade/platform/ui/util/UIUtils.java b/modules/platform-ui/src/main/java/com/shade/platform/ui/util/UIUtils.java
@@ -1,7 +1,6 @@
 package com.shade.platform.ui.util;
 
 import com.formdev.flatlaf.FlatClientProperties;
-import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.shade.platform.ui.UIColor;
 import com.shade.platform.ui.controls.validation.InputValidator;
 import com.shade.platform.ui.controls.validation.Validation;
@@ -49,7 +48,23 @@ public static int getSmallerFontSize() {
     }
 
     public static void setRenderingHints(@NotNull Graphics g) {
-        FlatUIUtils.setRenderingHints(g);
+        Graphics2D g2 = (Graphics2D) g;
+
+        Object aaHint = UIManager.get(RenderingHints.KEY_TEXT_ANTIALIASING);
+        if (aaHint != null) {
+            Object oldAA = g2.getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING);
+            if (aaHint != oldAA) {
+                g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, aaHint);
+            }
+        }
+
+        Object contrastHint = UIManager.get(RenderingHints.KEY_TEXT_LCD_CONTRAST);
+        if (contrastHint != null) {
+            Object oldContrast = g2.getRenderingHint(RenderingHints.KEY_TEXT_LCD_CONTRAST);
+            if (contrastHint != oldContrast) {
+                g2.setRenderingHint(RenderingHints.KEY_TEXT_LCD_CONTRAST, contrastHint);
+            }
+        }
     }
 
     public static void removeFrom(@NotNull Rectangle rect, @Nullable Insets insets) {