MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-167799 HiPDI menu arrows are too small for Darcula/IntelliJ themes on Windows and Linux

Browse Source
This commit is contained in:
Kirill Kirichenko
2017-02-07 11:56:45 +03:00
parent af7dd1def7
commit 3858f7980b
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+41
View File
@@ -51,6 +51,7 @@ import com.intellij.ui.content.Content;
import com.intellij.ui.mac.MacPopupMenuUI;
import com.intellij.ui.popup.OurHeavyWeightPopup;
import com.intellij.util.IJSwingUtilities;
import com.intellij.util.IconUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -600,6 +601,11 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
uiDefaults.put("Menu.opaque", true);
uiDefaults.put("MenuItem.opaque", true);
}
if ((SystemInfo.isLinux || SystemInfo.isWindows) && (UIUtil.isUnderIntelliJLaF() || UIUtil.isUnderDarcula())) {
uiDefaults.put("Menu.arrowIcon", new MenuArrowIcon(AllIcons.Actions.Right));
}
uiDefaults.put("MenuItem.background", UIManager.getColor("Menu.background"));
}
@@ -961,4 +967,39 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
}
}
}
private static class MenuArrowIcon implements Icon, UIResource {
private final Icon icon;
private final Icon selectedIcon;
private final Icon grayIcon;
private MenuArrowIcon(Icon icon) {
boolean invert = UIUtil.isUnderDarcula();
this.icon = invert ? IconUtil.brighter(icon, 2) : IconUtil.darker(icon, 2);
this.grayIcon = invert ? IconUtil.darker(icon, 2) : IconUtil.brighter(icon, 2);
this.selectedIcon = IconUtil.brighter(icon, 8);
}
@Override public void paintIcon(Component c, Graphics g, int x, int y) {
JMenuItem b = (JMenuItem) c;
ButtonModel model = b.getModel();
if (!model.isEnabled()) {
grayIcon.paintIcon(c, g, x, y);
} else if (model.isArmed() || ( c instanceof JMenu && model.isSelected())) {
selectedIcon.paintIcon(c, g, x, y);
}
else {
icon.paintIcon(c, g, x, y);
}
}
@Override public int getIconWidth() {
return icon.getIconWidth();
}
@Override public int getIconHeight() {
return icon.getIconHeight();
}
}
}