Merge pull request #650 from doki-theme/usabilityStuff

Usability Stuff

Author: Unthrottled

buildSrc/assets/templates/base.laf.template.json

@@ -41,6 +41,8 @@
     "StatusBar.background": "baseBackground",
     "SearchMatch.foreground": "baseBackground",
     "Popup.background": "baseBackground",
+    "Plugins.Button.installBackground": "baseBackground",
+
     "UIDesigner.Canvas.background": "textEditorBackground",
     "Content.background": "textEditorBackground",
     "Table.background": "textEditorBackground",

buildSrc/assets/templates/light.laf.template.json

@@ -7,5 +7,17 @@
     "Notification.ToolWindow.informativeForeground": "#33412e",
     "Notification.ToolWindow.warningForeground": "#5a5221",
     "Notification.ToolWindow.errorForeground": "#704745"
+  },
+  "icons": {
+    "ColorPalette": {
+      "Checkbox.Foreground.Selected": "baseBackground",
+      "Checkbox.Background.Selected": "accentColor",
+      "Checkbox.Border.Selected": "accentColor",
+      "Checkbox.Focus.Thin.Default": "baseBackground",
+      "Checkbox.Focus.Thin.Selected": "baseBackground",
+      "Checkbox.Focus.Wide": "accentColor",
+      "Checkbox.Foreground.Disabled": "baseBackground",
+      "Checkbox.Background.Disabled": "disabledColor"
+    }
   }
 }

buildSrc/assets/themes/nekoPara/shigure/light/shigure.light.jetbrains.definition.json

@@ -5,5 +5,8 @@
     "name": "Doki Light v2,Doki Dim Light Folding"
   },
   "overrides": {},
-  "ui": {}
+  "ui": {
+    "Plugins.lightSelectionBackground": "secondaryBackground",
+    "Plugins.hoverBackground": "secondaryBackground"
+  }
 }

buildSrc/src/main/kotlin/BuildThemes.kt

@@ -264,7 +264,7 @@ open class BuildThemes : DefaultTask() {
         constructableLookAndFeel,
         initialParentTemplateName,
       ),
-      icons = getIcons(resolvedNamedColors, constructableLookAndFeel),
+      icons = getIcons(resolvedNamedColors, constructableLookAndFeel, initialParentTemplateName),
       meta = masterThemeDefinition.meta ?: Collections.emptyMap()
     )
 
@@ -425,12 +425,22 @@ open class BuildThemes : DefaultTask() {
   @Suppress("UNCHECKED_CAST")
   private fun getIcons(
     colors: Map<String, String>,
-    constructableAsset: ConstructableAsset
+    constructableAsset: ConstructableAsset,
+    initialParentTemplateName: String
   ): Map<String, Any> {
     val template = constructableAsset.definitions["base"]
       ?: throw IllegalArgumentException("Expected constructable type '${constructableAsset.type}' to have type 'base'!")
+    val parentTemplate = constructableAsset.definitions[initialParentTemplateName]
+      ?: throw IllegalArgumentException("Expected constructable type '${constructableAsset.type}' to have type '${initialParentTemplateName}'!")
+    val parentIcons = template.icons?.toMutableMap() ?: mutableMapOf()
+    val childIcons = parentTemplate.icons?.toMutableMap() ?: mutableMapOf()
+    val combinedPalette = combineMaps(
+      (parentIcons["ColorPalette"] ?: emptyMap<String, String>()) as StringDictionary<Any>,
+      (childIcons["ColorPalette"] ?: emptyMap<String, String>()) as StringDictionary<Any>
+    )
+    parentIcons["ColorPalette"] = combinedPalette
     return resolveNamedColorsForMap(
-      template.icons ?: emptyMap(),
+      parentIcons,
       colors,
     )
   }

changelog/CHANGELOG.md

@@ -1,5 +1,11 @@
 Changelog
 ---
+# 88.4-1.9.4 [Usability Updates]
+
+- Made Light Theme's checkboxes & radio buttons more usable.
+- Sigure's list item selection is readable now.
+- Updated Sagiri's syntax highlight to avoid looking like an error.
+
 # 88.3-1.9.3 [New UI Updates]
 
 - Themed New UI Main Toolbar button pressed color.

changelog/RELEASE-NOTES.md

@@ -7,3 +7,6 @@
 - Fixed the settings window in builds `231.6890.12`+ 
 - Themed New UI header button hover & pressed color 
 - Updated New UI project tree spacing to mirror JetBrains' defaults.
+- Made Light Theme's checkboxes & radio buttons more usable.
+- Sigure's list item selection is readable now.
+- Updated Sagiri's syntax highlight to avoid looking like an error.

gradle.properties

@@ -2,7 +2,7 @@
 # -> https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html
 
 pluginGroup=io.unthrottled
-pluginVersion=88.3-1.9.3
+pluginVersion=88.4-1.9.4
 pluginSinceBuild=222
 pluginUntilBuild = 231.*