From 55a4852f19010b2fd0607a315ce958f2d2ba5df4 Mon Sep 17 00:00:00 2001 From: Anton Tarasov Date: Wed, 25 Oct 2017 17:57:18 +0300 Subject: [PATCH] IDEA-181071 context submenu arrow icon is low res on Retina --- platform/icons/src/mac/tree_black_right_arrow.png | Bin 0 -> 147 bytes .../icons/src/mac/tree_black_right_arrow@2x.png | Bin 0 -> 231 bytes .../com/intellij/ide/ui/laf/LafManagerImpl.java | 14 +------------- .../ide/ui/laf/intellijlaf_mac.properties | 1 + .../util/src/com/intellij/icons/AllIcons.java | 1 + 5 files changed, 3 insertions(+), 13 deletions(-) create mode 100644 platform/icons/src/mac/tree_black_right_arrow.png create mode 100644 platform/icons/src/mac/tree_black_right_arrow@2x.png diff --git a/platform/icons/src/mac/tree_black_right_arrow.png b/platform/icons/src/mac/tree_black_right_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..0de0b214b7291ce71e93e2b529890c822239af95 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhQJyZ2Ar-fhfBgS%&%9CMTtR86 zEz^-@JQfVQ9{ms4BhiuC5z2Gue&Y_#j>?Wep2O!GECf4d0$Jr!hF$SYg=_+w1&WHT t1wIQFeKt~|%QF=+q* literal 0 HcmV?d00001 diff --git a/platform/icons/src/mac/tree_black_right_arrow@2x.png b/platform/icons/src/mac/tree_black_right_arrow@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5e76166f96b3e5cb26cb5da92da3aafbb6b9b72c GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4f>pWc?Ln>}1|M>sko>|v``7Tdc zX{jyKk!3t7Of_u(+aDcu&~fH&cKl&2V9sdBzm>P`VY#)WPq()reJM%^bkecldbJ&mQfYjtOZPeH0spC0fc*W$0u|PPpq59UQNBRQinUXlO z-0t})Tw9t}w43S3yenrE^cyXhr!83#%CVK%P~Mb#VXA|U|JfwrkPEW|_b!nCQYy!= Y?RL`n^gEIEK$kOky85}Sb4q9e04)GgAOHXW literal 0 HcmV?d00001 diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java index ddde3ece8021..9489edb09273 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java @@ -394,19 +394,7 @@ public final class LafManagerImpl extends LafManager implements PersistentStateC @Nullable private static Icon getAquaMenuInvertedIcon() { if (UIUtil.isUnderAquaLookAndFeel() || (SystemInfo.isMac && UIUtil.isUnderIntelliJLaF())) { - final Icon arrow = (Icon)UIManager.get("Menu.arrowIcon"); - if (arrow == null) return null; - - try { - final Method method = ReflectionUtil.getMethod(arrow.getClass(), "getInvertedIcon"); - if (method != null) { - return (Icon)method.invoke(arrow); - } - return null; - } - catch (InvocationTargetException | IllegalAccessException e1) { - return null; - } + return AllIcons.Mac.Tree_white_right_arrow; } return null; } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties index 8cd5caadc77b..6d68ff60e70b 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties @@ -40,6 +40,7 @@ Menu.border=com.intellij.ide.ui.laf.intellij.MacIntelliJMenuItemBorder PopupMenu.background=f6f6f6 MenuItem.background=f6f6f6 Menu.background=f6f6f6 +Menu.arrowIcon=AllIcons.Mac.Tree_black_right_arrow SplitPane.highlight=ececec diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index f6799cdf6668..98d47f4c8366 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -807,6 +807,7 @@ public class AllIcons { public static class Mac { public static final Icon AppIconOk512 = IconLoader.getIcon("/mac/appIconOk512.png"); // 55x55 public static final Icon Text = IconLoader.getIcon("/mac/text.gif"); // 32x32 + public static final Icon Tree_black_right_arrow = IconLoader.getIcon("/mac/tree_black_right_arrow.png"); // 11x11 public static final Icon Tree_white_down_arrow = IconLoader.getIcon("/mac/tree_white_down_arrow.png"); // 11x11 public static final Icon Tree_white_right_arrow = IconLoader.getIcon("/mac/tree_white_right_arrow.png"); // 11x11 public static final Icon YosemiteOptionButtonSelector = IconLoader.getIcon("/mac/yosemiteOptionButtonSelector.png"); // 8x12