Merge pull request #646 from doki-theme/newUIStuff

New UI stuff

Author: Unthrottled

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

@@ -196,6 +196,7 @@
     "TabbedPane.hoverColor": "highlightColor",
     "TabbedPane.focusColor": "highlightColor",
     "EditorTabs.hoverBackground": "highlightColor",
+    "SearchOption.selectedPressedBackground": "highlightColor",
     "ActionButton.hoverBackground": "highlightColor",
     "ActionButton.hoverBorderColor": "highlightColor",
     "ActionButton.hoverSeparatorColor": "highlightColor",
@@ -209,6 +210,7 @@
     "ActionButton.pressedBorderColor": "highlightColor",
     "ActionButton.focusedBorderColor": "highlightColor",
     "MainToolbar.Dropdown.hoverBackground": "highlightColor",
+    "MainToolbar.Icon.pressedBackground": "highlightColor",
 
     "VersionControl.MarkerPopup.borderColor": "borderColor",
     "Borders.color": "borderColor",
@@ -417,6 +419,8 @@
     "RunWidget.StopButton.background": "diff.conflict",
     "RunWidget.StopButton.leftHoverBackground": "fileRed",
     "RunWidget.StopButton.leftPressedBackground": "diff.conflict",
+    "RunWidget.hoverBackground": "highlightColor",
+    "RunWidget.pressedBackground": "highlightColor",
 
 
     "VersionControl": {

changelog/CHANGELOG.md

@@ -1,5 +1,8 @@
 Changelog
 ---
+# 88.3-1.9.3 [New UI Updates]
+
+- Themed New UI Main Toolbar button pressed color.
 
 # 88.3-1.9.2 [EXP UI Updates]
 

changelog/RELEASE-NOTES.md

@@ -5,5 +5,5 @@
 - 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`+ 
-- Themed EXP UI header button hover color
-- Updated EXP UI project tree spacing to mirror JetBrains' defaults.
+- Themed New UI header button hover & pressed color 
+- Updated New UI project tree spacing to mirror JetBrains' defaults.

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.2
+pluginVersion=88.3-1.9.3
 pluginSinceBuild=222
 pluginUntilBuild = 231.*
 
@@ -30,14 +30,6 @@ kotlin.stdlib.default.dependency = false
 
 idePrefix=IU
 idePath=
-#idePath=/Users/alexsimons/Library/Application Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/222.4167.29/IntelliJ IDEA 2022.1 EAP.app/Contents
-#idePath=C:\\Users\\birdm.DESKTOP-FO92PV5\\AppData\\Local\\JetBrains\\Toolbox\\apps\\DataSpell\\ch-0\\213.5744.251
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/AndroidStudio/ch-0/203.7321754
+#idePath=/Users/alexsimons/Library/Application Support/JetBrains/Toolbox/apps/IDEA-C/ch-0/231.7515.13/IntelliJ IDEA 2023.1 CE EAP.app/Contents
 #idePath=C:\\Users\\birdm.DESKTOP-FO92PV5\\AppData\\Local\\JetBrains\\Toolbox\\apps\\Rider\\ch-0\\212.4416.21
 #idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/IDEA-U/ch-0/202.7660.26
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/PhpStorm/ch-0/193.5233.101
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/RubyMine/ch-0/193.5233.108
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/PyCharm-P/ch-0/193.6015.41
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/Goland/ch-0/193.5233.112
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/CLion/ch-0/193.5233.144
-#idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/WebStorm/ch-0/211.7142.46

src/main/kotlin/io/unthrottled/doki/TheDokiTheme.kt

@@ -118,7 +118,7 @@ class TheDokiTheme : Disposable {
               UpdateNotification.display(
                 project,
                 version,
-                isNewUser,
+                isNewUser
               )
             }
           }

src/main/kotlin/io/unthrottled/doki/actions/HideOnHoverAction.kt

@@ -11,7 +11,7 @@ class HideOnHoverAction : BaseToggleAction(), DumbAware {
   override fun setSelected(e: AnActionEvent, state: Boolean) {
     StickerHideActor.setStickerHideStuff(
       state,
-      ThemeConfig.instance.hideDelayMS,
+      ThemeConfig.instance.hideDelayMS
     )
   }
 }

src/main/kotlin/io/unthrottled/doki/actions/ShowUpdateNotification.kt

@@ -14,7 +14,7 @@ class ShowUpdateNotification : AnAction(), DumbAware {
         UpdateNotification.display(
           e.project!!,
           it,
-          false,
+          false
         )
       }
   }

src/main/kotlin/io/unthrottled/doki/discreet/AbstractDiscreetModeListener.kt

@@ -86,7 +86,7 @@ abstract class AbstractDiscreetModeListener : DiscreetModeListener, Logging {
     ThemeConfig.instance.currentStickerLevel == StickerLevel.ON,
     ThemeConfig.instance.isDokiBackground,
     EditorBackgroundWallpaperService.instance.getCurrentBackgroundValue(),
-    ThemeConfig.instance.isEmptyFrameBackground,
+    ThemeConfig.instance.isEmptyFrameBackground
   )
 }
 
@@ -95,5 +95,5 @@ data class DiscreetModeRestorationConfig(
   val stickersEnabled: Boolean?,
   val editorWallpaperEnabled: Boolean?,
   val savedBackground: String?,
-  val emptyWallpaperEnabled: Boolean?,
+  val emptyWallpaperEnabled: Boolean?
 )

src/main/kotlin/io/unthrottled/doki/hax/HackComponent.kt

@@ -238,7 +238,7 @@ object HackComponent : Disposable {
       )
       setFinalStatic(
         ContentRootPanel::class.java.getDeclaredField("CONTENT_COLOR"),
-        UIUtil.getPanelBackground(),
+        UIUtil.getPanelBackground()
       )
     }) {
       log.warn("Unable to hackBookMarkBorder  for reasons.")

src/main/kotlin/io/unthrottled/doki/icon/ColorPatcher.kt

@@ -75,7 +75,7 @@ object ColorPatcher : PatcherProvider {
 
   private fun buildHackedPatcher(
     otherPatchers: List<Patcher>,
-    patcherKey: String,
+    patcherKey: String
   ): Patcher {
     val cachedPatcher = patcherCache.getIfPresent(patcherKey)
     if (cachedPatcher !== null) {