User: kikugie
Date: 01 Aug 24 11:08
Revision: 93be50594da1105874d960a8a873e301404c39ea
Summary:
Use `LayeredIcon` for mixin classes (#2340)

* Use layered icons for mixin classes

* Resize icons

* Remove outlines

* Use `IconLayerProvider`

* Clean up svg

TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=9522&personal=false

Index: src/main/kotlin/asset/MixinAssets.kt
===================================================================
--- src/main/kotlin/asset/MixinAssets.kt	(revision e54877a7ab68d6ad87f32d951ec94ed428279d55)
+++ src/main/kotlin/asset/MixinAssets.kt	(revision 93be50594da1105874d960a8a873e301404c39ea)
@@ -27,4 +27,6 @@
 
     val MIXIN_CLASS_ICON = loadIcon("/assets/icons/mixin/mixin_class_gutter.png")
     val MIXIN_CLASS_ICON_DARK = loadIcon("/assets/icons/mixin/mixin_class_gutter_dark.png")
+
+    val MIXIN_MARK = loadIcon("/assets/icons/mixin/mixin_mark.svg")
 }
Index: src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt	(revision e54877a7ab68d6ad87f32d951ec94ed428279d55)
+++ src/main/kotlin/platform/mixin/framework/MixinIconProvider.kt	(revision 93be50594da1105874d960a8a873e301404c39ea)
@@ -21,15 +21,19 @@
 package com.demonwav.mcdev.platform.mixin.framework
 
 import com.demonwav.mcdev.MinecraftSettings
-import com.demonwav.mcdev.asset.PlatformAssets
+import com.demonwav.mcdev.asset.MixinAssets
 import com.demonwav.mcdev.platform.mixin.util.isMixin
-import com.intellij.ide.IconProvider
+import com.intellij.ide.IconLayerProvider
+import com.intellij.openapi.util.Iconable
 import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiElement
+import javax.swing.Icon
 
-class MixinIconProvider : IconProvider() {
-    override fun getIcon(element: PsiElement, flags: Int) =
-        PlatformAssets.MIXIN_ICON.takeIf {
+class MixinIconProvider : IconLayerProvider {
+    override fun getLayerIcon(element: Iconable, isLocked: Boolean): Icon? =
+        MixinAssets.MIXIN_MARK.takeIf {
             MinecraftSettings.instance.mixinClassIcon && element is PsiClass && element.isMixin
         }
+
+    override fun getLayerDescription(): String =
+        "Mixin class"
 }
Index: src/main/resources/META-INF/plugin.xml
===================================================================
--- src/main/resources/META-INF/plugin.xml	(revision e54877a7ab68d6ad87f32d951ec94ed428279d55)
+++ src/main/resources/META-INF/plugin.xml	(revision 93be50594da1105874d960a8a873e301404c39ea)
@@ -534,7 +534,7 @@
 
         <library.presentationProvider implementation="com.demonwav.mcdev.platform.mixin.framework.MixinPresentationProvider" />
 
-        <iconProvider implementation="com.demonwav.mcdev.platform.mixin.framework.MixinIconProvider" />
+        <iconLayerProvider implementation="com.demonwav.mcdev.platform.mixin.framework.MixinIconProvider" />
 
         <!--region MixinExtras Expression Language-->
         <fileType name="MixinExtras Expression File"
Index: src/main/resources/assets/icons/mixin/mixin_mark.svg
===================================================================
--- src/main/resources/assets/icons/mixin/mixin_mark.svg	(revision 93be50594da1105874d960a8a873e301404c39ea)
+++ src/main/resources/assets/icons/mixin/mixin_mark.svg	(revision 93be50594da1105874d960a8a873e301404c39ea)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(1.2403 0 0 1.2403 -3.8451 -.7659)"><path d="m10.533 7.9223c-0.45453 0.014209-0.78588 0.30122-0.86381 0.74812-0.018532 0.10626-0.019253 2.3972-6.547e-4 2.5106 0.075712 0.46543 0.41995 0.75567 0.93448 0.78791 0.06438 0.0039 0.11917 0.0095 0.1218 0.01211 0.0071 0.0071 6e-3 1.7167-0.0013 1.7421-0.0033 0.01185-0.0098 0.02161-0.01435 0.02161-0.01441 0-0.18474 0.08355-0.22054 0.10818-0.0995 0.06845-0.17415 0.187-0.19845 0.31513-0.02016 0.10606-0.01781 0.67064 0.0033 0.76533 0.04722 0.21356 0.19749 0.36284 0.39764 0.39504 0.34788 0.05599 0.61744-0.07661 0.67157-0.33033 0.01303-0.06122 0.01446-0.82456 0.0013-0.89635-0.0256-0.14353-0.11211-0.23668-0.29821-0.32122-0.04989-0.02266-0.09463-0.04794-0.09935-0.05619-0.01237-0.02161-0.01231-1.7358 8e-5 -1.7482 0.0065-0.0065 0.50625-0.0085 1.8936-0.0079 2.0632 0.0013 1.9753 0.0033 2.1166-0.04393 0.31937-0.1061 0.53602-0.33444 0.61397-0.64707l0.01864-0.07463v-1.6894l-0.02269-0.090368c-0.071473-0.2854-0.26592-0.50594-0.53421-0.60587-0.12168-0.045315-0.16822-0.049047-0.67288-0.053828l-0.45962-0.00458-0.0094-0.047148c-0.0053-0.025932-0.01487-0.080741-0.02148-0.1218-0.05205-0.32139-0.33695-0.60275-0.66862-0.66035-0.0611-0.010608-2.3807-0.016895-2.6874-0.00727m2.5381 0.41624c0.28228 0.031105 0.41221 0.177 0.42494 0.4771 0.01466 0.34556-0.09494 0.52409-0.35373 0.57611-0.11035 0.0222-2.5583 0.02541-2.6846 0.0033-0.17091-0.0296-0.29418-0.13913-0.34502-0.30652-0.01617-0.053238-0.01958-0.33487-0.0046-0.40455 0.03464-0.16439 0.14702-0.28631 0.30585-0.33173 0.02456-0.00701 0.32528-0.010542 1.1841-0.013817 0.63316-0.00262 1.2078-0.00523 1.2769-0.00589 0.06915-0.00131 0.15755 0.00196 0.19645 0.00589" fill="#ebac24" fill-rule="evenodd" stroke="#ebac24" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.8" stroke-width=".40312" style="paint-order:stroke fill markers"/></g></svg>