Settings Menu Fix (#638)

* More consistent Rider New UI Scrollbars. * Fixed the settings window in builds 231.6890.12+
doki-theme · Feb 13, 2023 · 890158b · 890158b
1 parent f9f7cd6
commit 890158b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/buildSrc/assets/templates/dark.scheme.template.xml b/buildSrc/assets/templates/dark.scheme.template.xml
@@ -123,6 +123,7 @@
     <option name="ScrollBar.thumbBorderColor" value="%accentColor%5a"/>
     <option name="ScrollBar.thumbColor" value="%accentColor%5a"/>
     <option name="ScrollBar.trackColor" value="$textEditorBackground$"/>
+    <option name="ScrollBar.background" value="$textEditorBackground$"/>
     <option name="TEARLINE_COLOR" value="$lineNumberColor$69"/>
     <option name="TOOLTIP" value="$textEditorBackground$"/>
     <option name="VCS_ANNOTATIONS_COLOR_1" value="$headerColor$"/>

diff --git a/buildSrc/assets/templates/light.scheme.template.xml b/buildSrc/assets/templates/light.scheme.template.xml
@@ -121,6 +121,7 @@
     <option name="ScrollBar.thumbBorderColor" value="%accentColor%5a"/>
     <option name="ScrollBar.thumbColor" value="%accentColor%5a"/>
     <option name="ScrollBar.trackColor" value="$textEditorBackground$"/>
+    <option name="ScrollBar.background" value="$textEditorBackground$"/>
     <option name="TEARLINE_COLOR" value="$lineNumberColor$69"/>
     <option name="TOOLTIP" value="$textEditorBackground$"/>
     <option name="VCS_ANNOTATIONS_COLOR_1" value="$headerColor$"/>

diff --git a/changelog/CHANGELOG.md b/changelog/CHANGELOG.md
@@ -1,5 +1,11 @@
 Changelog
 ---
+
+# 88.3-1.9.1 [Bug Fixes]
+
+- Themed New UI Scrollbars in Rider to be consistent.
+- Fixed the settings window in builds `231.6890.12`+ 
+
 # 88.3-1.9.0 [EXP UI Search Field Fix]
 
 - Vertically aligned the editor search text input on the new UI.

diff --git a/changelog/RELEASE-NOTES.md b/changelog/RELEASE-NOTES.md
@@ -2,4 +2,6 @@
 - Added the initial 2023.1 build support. 
 - Updated the border color of the `Code Lense` feature.
 - Vertically aligned the editor search text input on the new UI.
-- Allow custom stickers to remain on IDE for non-Doki themes.
+- 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`+ 
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.0
+pluginVersion=88.3-1.9.1
 pluginSinceBuild=222
 pluginUntilBuild = 231.*
 
@@ -32,7 +32,7 @@ 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=/home/alex/.local/share/JetBrains/Toolbox/apps/AndroidStudio/ch-0/203.7321754
 #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

diff --git a/src/main/java/io/unthrottled/doki/settings/ThemeSettingsUI.form b/src/main/java/io/unthrottled/doki/settings/ThemeSettingsUI.form
@@ -140,7 +140,6 @@
                                       <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                                     </constraints>
                                     <properties>
-                                      <icon value="actions/help.png"/>
                                       <text resource-bundle="messages/MessageBundle" key="settings.general.content.sticker.margin.info"/>
                                     </properties>
                                   </component>
@@ -446,7 +445,6 @@
                               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                             </constraints>
                             <properties>
-                              <icon value="general/warning.png"/>
                               <text resource-bundle="messages/MessageBundle" key="settings.general.weeb.background.editor.info"/>
                             </properties>
                           </component>

diff --git a/src/main/java/io/unthrottled/doki/settings/ThemeSettingsUI.java b/src/main/java/io/unthrottled/doki/settings/ThemeSettingsUI.java
@@ -1,5 +1,6 @@
 package io.unthrottled.doki.settings;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.application.Application;
@@ -101,6 +102,9 @@ String getId() {
   }
 
   private void initializeAutoCreatedComponents() {
+    warningLabel.setIcon(AllIcons.General.Warning);
+    marginHelp.setIcon(AllIcons.Actions.Help);
+
     chooseImageButton.addActionListener(e -> {
       CustomStickerChooser dialog = new CustomStickerChooser(
         Arrays.stream(ProjectManager.getInstance().getOpenProjects()).findFirst().orElse(