Make togglebutton hints depend on contrast property of theme.

weisJ · Feb 6, 2021 · b152520 · b152520
1 parent fe1ba8c
commit b152520
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/toggleButton.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/toggleButton.properties
@@ -39,5 +39,5 @@ ToggleButton.inactiveFillColor             = %widgetFill
 ToggleButton.activeFillColor               = %textForegroundInactive
 
 ToggleButton.sliderSize                    = 35,17
-ToggleButton.showSliderHints               = false
+ToggleButton.showSliderHints               = %Theme.highContrast
 ToggleButton.animated                      = true
diff --git a/core/src/test/java/theme/ThemeEditor.java b/core/src/test/java/theme/ThemeEditor.java
@@ -182,10 +182,12 @@ public void customizeIconTheme(final Properties properties, final UIDefaults cur
 
         apply.addActionListener(e -> {
             mutableTheme.setDelegate(baseTheme.get());
-            mutableTheme.colorToneRule =
-                    darkToggle.isSelected() ? ColorToneRule.DARK : ColorToneRule.LIGHT;
-            mutableTheme.contrastRule =
-                    contrastToggle.isSelected() ? ContrastRule.HIGH_CONTRAST : ContrastRule.STANDARD;
+            mutableTheme.colorToneRule = darkToggle.isSelected()
+                    ? ColorToneRule.DARK
+                    : ColorToneRule.LIGHT;
+            mutableTheme.contrastRule = contrastToggle.isSelected()
+                    ? ContrastRule.HIGH_CONTRAST
+                    : ContrastRule.STANDARD;
             LafManager.setTheme((Theme) null);
             LafManager.install(mutableTheme);
         });

diff --git a/...ources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_ui.properties b/...ources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_ui.properties
@@ -30,4 +30,3 @@ TabbedPane.selectedHoverBackground      = %backgroundHover
 ToolTip.paintShadow                     = false
 RootPane.borderInsets                   = 1,1,1,1
 ScrollBar.thumbAlpha                    = 100
-ToggleButton.showSliderHints            = true
diff --git a/...rces/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_ui.properties b/...rces/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_ui.properties
@@ -33,4 +33,3 @@ TabFrameTab.selectedForeground          = %textSelectionForeground
 TabFrameTab.hoverForeground             = %textSelectionForeground
 RootPane.borderInsets                   = 1,1,1,1
 ScrollBar.thumbAlpha                    = 100
-ToggleButton.showSliderHints            = true