From 202709dff4f3c82d15c43d1804b579bc28d659ca Mon Sep 17 00:00:00 2001 From: Konstantin Homatyano Date: Fri, 6 Mar 2026 12:19:24 +0100 Subject: [PATCH 1/3] RIDER-134564 Design icons for .NET Disassembler plugin --- src/rider/main/resources/META-INF/plugin.xml | 2 ++ .../main/resources/META-INF/pluginIcon.svg | 17 +++++++++++++++++ .../resources/disassemblerIconMappings.json | 7 +++++++ .../resources/icons/disassemblerToolWindow.svg | 5 +++++ .../icons/disassemblerToolWindow_dark.svg | 5 +++++ .../icons/expui/disassemblerToolWindow.svg | 5 +++++ .../expui/disassemblerToolWindow@20x20.svg | 5 +++++ .../expui/disassemblerToolWindow@20x20_dark.svg | 5 +++++ .../icons/expui/disassemblerToolWindow_dark.svg | 5 +++++ 9 files changed, 56 insertions(+) create mode 100644 src/rider/main/resources/META-INF/pluginIcon.svg create mode 100644 src/rider/main/resources/disassemblerIconMappings.json create mode 100644 src/rider/main/resources/icons/disassemblerToolWindow.svg create mode 100644 src/rider/main/resources/icons/disassemblerToolWindow_dark.svg create mode 100644 src/rider/main/resources/icons/expui/disassemblerToolWindow.svg create mode 100644 src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg create mode 100644 src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg create mode 100644 src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml index 8ce2bc4..9a693e4 100644 --- a/src/rider/main/resources/META-INF/plugin.xml +++ b/src/rider/main/resources/META-INF/plugin.xml @@ -34,6 +34,8 @@ + + diff --git a/src/rider/main/resources/META-INF/pluginIcon.svg b/src/rider/main/resources/META-INF/pluginIcon.svg new file mode 100644 index 0000000..df88f5e --- /dev/null +++ b/src/rider/main/resources/META-INF/pluginIcon.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/rider/main/resources/disassemblerIconMappings.json b/src/rider/main/resources/disassemblerIconMappings.json new file mode 100644 index 0000000..f738c51 --- /dev/null +++ b/src/rider/main/resources/disassemblerIconMappings.json @@ -0,0 +1,7 @@ +{ + "icons": { + "expui": { + "disassemblerToolWindow.svg": "icons/disassemblerToolWindow.svg" + } + } +} diff --git a/src/rider/main/resources/icons/disassemblerToolWindow.svg b/src/rider/main/resources/icons/disassemblerToolWindow.svg new file mode 100644 index 0000000..dea7d77 --- /dev/null +++ b/src/rider/main/resources/icons/disassemblerToolWindow.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/rider/main/resources/icons/disassemblerToolWindow_dark.svg b/src/rider/main/resources/icons/disassemblerToolWindow_dark.svg new file mode 100644 index 0000000..7cd4354 --- /dev/null +++ b/src/rider/main/resources/icons/disassemblerToolWindow_dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow.svg new file mode 100644 index 0000000..33dfb05 --- /dev/null +++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg new file mode 100644 index 0000000..dabb9a0 --- /dev/null +++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg new file mode 100644 index 0000000..c86ee18 --- /dev/null +++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow@20x20_dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg b/src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg new file mode 100644 index 0000000..0978329 --- /dev/null +++ b/src/rider/main/resources/icons/expui/disassemblerToolWindow_dark.svg @@ -0,0 +1,5 @@ + + + + + From d73c7bbdcef5ed3336d26b5669ae818ca42755fd Mon Sep 17 00:00:00 2001 From: smolchanovsky Date: Mon, 9 Mar 2026 13:12:59 +0400 Subject: [PATCH 2/3] RIDER-134564 Apply new icons --- .../rider/plugins/dotnetdisassembler/AsmViewerIcons.kt | 9 +++++++++ src/rider/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt new file mode 100644 index 0000000..d8e10a4 --- /dev/null +++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerIcons.kt @@ -0,0 +1,9 @@ +package com.jetbrains.rider.plugins.dotnetdisassembler + +import com.intellij.openapi.util.IconLoader +import javax.swing.Icon + +object AsmViewerIcons { + @JvmField + val ToolWindow: Icon = IconLoader.getIcon("/icons/disassemblerToolWindow.svg", AsmViewerIcons::class.java) +} diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml index 9a693e4..5ba9dc9 100644 --- a/src/rider/main/resources/META-INF/plugin.xml +++ b/src/rider/main/resources/META-INF/plugin.xml @@ -24,7 +24,7 @@ From 2e3018107d81a12df8f9c9d46f564ed270c4e552 Mon Sep 17 00:00:00 2001 From: smolchanovsky Date: Mon, 9 Mar 2026 13:51:19 +0400 Subject: [PATCH 3/3] RIDER-134564 Fix icon focus --- .../rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt index 5784a2f..4bb3a09 100644 --- a/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt +++ b/src/rider/main/kotlin/com/jetbrains/rider/plugins/dotnetdisassembler/AsmViewerHostUi.kt @@ -68,6 +68,7 @@ class AsmViewerHostUi(private val project: Project) : LifetimedService() { } val content = contentManager.factory.createContent(wrapper, "", false) + content.preferredFocusableComponent = contentContainer contentManager.addContent(content) val newPanel = AsmContentPanelFactory.create(project, null, null)