Merge pull request #643 from doki-theme/hoverFix

New UI Updates
doki-theme · Feb 17, 2023 · 2f46557 · 2f46557
2 parents 7a6e20d + 2c1af4e
commit 2f46557
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json
@@ -348,6 +348,7 @@
     "Button.default.endBorderColor": "selectionBackground",
     "Button.default.startBorderColor":"selectionBackground",
     "Button.default.foreground": "selectionForeground",
+    "MainToolbar.Icon.hoverBackground": "highlightColor",
     "ActionButton.pressedBackground": "highlightColor",
     "SearchOption.selectedBackground": "highlightColor",
     "SegmentedButton.selectedButtonColor": "highlightColor",

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  kotlin("jvm") version "1.8.10"
   `kotlin-dsl`
 }
 
@@ -17,5 +18,5 @@ repositories {
 
 dependencies {
   implementation("org.jsoup:jsoup:1.15.3")
-  implementation("io.unthrottled.doki.build.jvm:doki-build-source-jvm:88.0.5")
+  implementation("io.unthrottled.doki.build.jvm:doki-build-source-jvm:88.0.6")
 }
diff --git a/buildSrc/src/main/kotlin/BuildThemes.kt b/buildSrc/src/main/kotlin/BuildThemes.kt
@@ -1,4 +1,5 @@
 import com.google.gson.GsonBuilder
+import com.google.gson.ToNumberPolicy
 import groovy.util.Node
 import groovy.util.NodeList
 import io.unthrottled.doki.build.jvm.models.AssetTemplateDefinition
@@ -56,7 +57,10 @@ open class BuildThemes : DefaultTask() {
     private const val DOKI_THEME_ULTIMATE = "ultimate"
   }
 
-  private val gson = GsonBuilder().setPrettyPrinting().create()
+  private val gson = GsonBuilder()
+    .setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
+    .setPrettyPrinting()
+    .create()
 
   init {
     group = "doki"

diff --git a/changelog/CHANGELOG.md b/changelog/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 ---
 
+# 88.3-1.9.2 [EXP UI Updates]
+
+- Themed EXP UI header button hover color
+- Updated EXP UI project tree spacing to mirror JetBrains' defaults.
+
 # 88.3-1.9.1 [Bug Fixes]
 
 - Themed New UI Scrollbars in Rider to be consistent.

diff --git a/changelog/RELEASE-NOTES.md b/changelog/RELEASE-NOTES.md
@@ -4,4 +4,6 @@
 - Vertically aligned the editor search text input on the new UI.
 - Allow custom stickers to remain on IDE for non-Doki themes.
 - Themed New UI Scrollbars in Rider to be consistent.
-- Fixed the settings window in builds `231.6890.12`+ 
+- Fixed the settings window in builds `231.6890.12`+ 
+- Themed EXP UI header button hover color
+- Updated EXP UI project tree spacing to mirror JetBrains' defaults.
diff --git a/gradle.properties b/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.1
+pluginVersion=88.3-1.9.2
 pluginSinceBuild=222
 pluginUntilBuild = 231.*
 

diff --git a/src/main/kotlin/io/unthrottled/doki/legacy/EXPUIBastardizer.kt b/src/main/kotlin/io/unthrottled/doki/legacy/EXPUIBastardizer.kt
@@ -36,6 +36,8 @@ object EXPUIBastardizer : LafManagerListener, Disposable {
         setUIProperty("ToolWindow.Button.selectedBackground", dokiTheme.getColor("highlightColor"), defaults)
         setUIProperty("ToolWindow.Button.selectedForeground", dokiTheme.getColor("iconAccent"), defaults)
         setUIProperty("Editor.SearchField.borderInsets", JBUI.insets(7, 10, 7, 8), defaults)
+        setUIProperty("Tree.rowHeight", 24, defaults)
+        setUIProperty("Tree.border", JBUI.insets(4, 12), defaults)
       }
       overrideSetProperties(iterations + 1)
     }