From d15bf8a552f7c21635afb08b5c7af1d7037dd1d6 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Fri, 15 Oct 2021 20:09:14 +0300 Subject: [PATCH] ExpUI: use 16x16 icons in Tool Window Switcher GitOrigin-RevId: 9c8bef87b2a89a146768297226956d98974e10e5 --- .../src/com/intellij/ide/actions/ToolwindowSwitcher.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToolwindowSwitcher.java b/platform/platform-impl/src/com/intellij/ide/actions/ToolwindowSwitcher.java index 6640cb841d92..cfcd476c4317 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToolwindowSwitcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToolwindowSwitcher.java @@ -12,6 +12,7 @@ import com.intellij.openapi.ui.popup.IPopupChooserBuilder; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.ScalableIcon; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowManager; @@ -146,7 +147,11 @@ public class ToolwindowSwitcher extends DumbAwareAction { UIUtil.setBackgroundRecursively(myPanel, UIUtil.getListBackground(isSelected, true)); myTextLabel.clear(); myTextLabel.append(value.getStripeTitle()); - myTextLabel.setIcon(ObjectUtils.notNull(value.getIcon(), EmptyIcon.ICON_13)); + Icon icon = value.getIcon(); + if (icon instanceof ScalableIcon) { + icon = ((ScalableIcon)icon).scale(16f / icon.getIconWidth()); + } + myTextLabel.setIcon(ObjectUtils.notNull(icon, EmptyIcon.ICON_16)); myTextLabel.setForeground(UIUtil.getListForeground(isSelected, true)); myTextLabel.setBackground(UIUtil.getListBackground(isSelected, true)); String activateActionId = ActivateToolWindowAction.getActionIdForToolWindow(value.getId());