Merge pull request #660 from doki-theme/mnemonicBookMarkFix

Better Mnemonic Bookmarks
doki-theme · Mar 14, 2023 · c735c98 · c735c98
2 parents f6c4cb6 + 2d648ec
commit c735c98
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 6 deletions.
diff --git a/buildSrc/assets/templates/base.laf.template.json b/buildSrc/assets/templates/base.laf.template.json
@@ -508,7 +508,7 @@
     "BookmarkMnemonicIcon.foreground": "headerColor",
     "BookmarkMnemonicIcon.background":"accentColor",
     "BookmarkMnemonicIcon.borderColor": "accentColor",
-    "Bookmark.Mnemonic.iconForeground": "headerColor",
+    "Bookmark.Mnemonic.iconForeground": "accentColor",
     "Bookmark.Mnemonic.iconBackground":"accentColor",
     "Bookmark.Mnemonic.iconBorderColor": "accentColor",
 

diff --git a/buildSrc/assets/templates/dark.scheme.template.xml b/buildSrc/assets/templates/dark.scheme.template.xml
@@ -21,8 +21,7 @@
     <option name="ActionButton.iconTextForeground" value="$infoForeground$"/>
     <option name="ActionButton.hoverBackground" value="$highlightColor$"/>
     <option name="ActionButton.pressedBackground" value="$highlightColor$"/>
-    <option name="Bookmark.Mnemonic.iconForeground" value="$textEditorBackground$"/>
-    <option name="Bookmark.Mnemonic.iconBackground" value="%accentColor%"/>
+    <option name="Bookmark.Mnemonic.iconForeground" value="%accentColor%"/>
     <option name="Bookmark.Mnemonic.iconBorderColor" value="%accentColor%"/>
     <option name="BookmarkMnemonicIcon.foreground" value="$textEditorBackground$"/>
     <option name="BookmarkMnemonicIcon.background" value="%accentColor%"/>

diff --git a/buildSrc/assets/templates/light.scheme.template.xml b/buildSrc/assets/templates/light.scheme.template.xml
@@ -22,8 +22,7 @@
     <option name="ActionButton.hoverBackground" value="$highlightColor$"/>
     <option name="ActionButton.pressedBackground" value="$highlightColor$"/>
     <option name="BookmarkIcon.background" value="%accentColor%"/>
-    <option name="Bookmark.Mnemonic.iconForeground" value="$textEditorBackground$"/>
-    <option name="Bookmark.Mnemonic.iconBackground" value="%accentColor%"/>
+    <option name="Bookmark.Mnemonic.iconForeground" value="%accentColor%"/>
     <option name="Bookmark.Mnemonic.iconBorderColor" value="%accentColor%"/>
     <option name="BookmarkMnemonicIcon.foreground" value="$textEditorBackground$"/>
     <option name="BookmarkMnemonicIcon.background" value="%accentColor%"/>

diff --git a/changelog/CHANGELOG.md b/changelog/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 ---
 
+# 88.5-1.9.7 [Mnemonics]
+
+- More usable Mnemonic Bookmarks
+
 # 88.5-1.9.6 [Maintenance]
 
 - Migrated to newer platform APIs

diff --git a/changelog/RELEASE-NOTES.md b/changelog/RELEASE-NOTES.md
@@ -13,4 +13,5 @@
 - Made Non-Functional & Non-User-facing code cleanup updates.
 - Migrated to newer platform APIs
 - Raised the lowest supported version to 2022.3
+- More usable Mnemonic Bookmarks
 
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.5-1.9.6
+pluginVersion=88.5-1.9.7
 pluginSinceBuild= 223
 pluginUntilBuild = 231.*
 

diff --git a/src/main/resources/icons/gutter/mnemonic.svg b/src/main/resources/icons/gutter/mnemonic.svg
diff --git a/src/main/resources/icons/gutter/mnemonic_dark.svg b/src/main/resources/icons/gutter/mnemonic_dark.svg
diff --git a/src/main/resources/icons/nodes/mnemonic.svg b/src/main/resources/icons/nodes/mnemonic.svg
diff --git a/src/main/resources/icons/nodes/mnemonic_dark.svg b/src/main/resources/icons/nodes/mnemonic_dark.svg
diff --git a/src/main/resources/mappings/ui-icons.path.mappings.json b/src/main/resources/mappings/ui-icons.path.mappings.json
@@ -438,5 +438,21 @@
   {
     "originalPath": "/vcs/vendors/github_dark.svg",
     "replacementPath": "/icons/vcs/vendors/github_dark.svg"
+  },
+  {
+    "originalPath": "/gutter/mnemonic.svg",
+    "replacementPath": "/icons/gutter/mnemonic.svg"
+  },
+  {
+    "originalPath": "/gutter/mnemonic_dark.svg",
+    "replacementPath": "/icons/gutter/mnemonic_dark.svg"
+  },
+  {
+    "originalPath": "/nodes/mnemonic.svg",
+    "replacementPath": "/icons/nodes/mnemonic.svg"
+  },
+  {
+    "originalPath": "/nodes/mnemonic_dark.svg",
+    "replacementPath": "/icons/nodes/mnemonic_dark.svg"
   }
 ]