From 6b36da2b0407f956896ea9e53836207749c78413 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sat, 5 Sep 2015 18:30:25 +0300 Subject: [PATCH] refactor button ui, rename resources to work with image cache --- ...edButtonLeft.png => buttonLeftFocused.png} | Bin ...onLeft@2x.png => buttonLeftFocused@2x.png} | Bin ...dButtonLeft.png => buttonLeftSelected.png} | Bin ...nLeft@2x.png => buttonLeftSelected@2x.png} | Bin ...Left.png => buttonLeftSelectedFocused.png} | Bin ...x.png => buttonLeftSelectedFocused@2x.png} | Bin ...ttonMiddle.png => buttonMiddleFocused.png} | Bin ...ddle@2x.png => buttonMiddleFocused@2x.png} | Bin ...tonMiddle.png => buttonMiddleSelected.png} | Bin ...dle@2x.png => buttonMiddleSelected@2x.png} | Bin ...le.png => buttonMiddleSelectedFocused.png} | Bin ...png => buttonMiddleSelectedFocused@2x.png} | Bin ...ButtonRight.png => buttonRightFocused.png} | Bin ...Right@2x.png => buttonRightFocused@2x.png} | Bin ...uttonRight.png => buttonRightSelected.png} | Bin ...ight@2x.png => buttonRightSelected@2x.png} | Bin ...ght.png => buttonRightSelectedFocused.png} | Bin ....png => buttonRightSelectedFocused@2x.png} | Bin ...edHelpButton.png => helpButtonFocused.png} | Bin ...Button@2x.png => helpButtonFocused@2x.png} | Bin .../ui/laf/intellij/MacIntelliJButtonUI.java | 29 +++--------------- 21 files changed, 5 insertions(+), 24 deletions(-) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedButtonLeft.png => buttonLeftFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedButtonLeft@2x.png => buttonLeftFocused@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{selectedButtonLeft.png => buttonLeftSelected.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{selectedButtonLeft@2x.png => buttonLeftSelected@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedSelectedButtonLeft.png => buttonLeftSelectedFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedSelectedButtonLeft@2x.png => buttonLeftSelectedFocused@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedButtonMiddle.png => buttonMiddleFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedButtonMiddle@2x.png => buttonMiddleFocused@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{selectedButtonMiddle.png => buttonMiddleSelected.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{selectedButtonMiddle@2x.png => buttonMiddleSelected@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedSelectedButtonMiddle.png => buttonMiddleSelectedFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedSelectedButtonMiddle@2x.png => buttonMiddleSelectedFocused@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedButtonRight.png => buttonRightFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedButtonRight@2x.png => buttonRightFocused@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{selectedButtonRight.png => buttonRightSelected.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{selectedButtonRight@2x.png => buttonRightSelected@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedSelectedButtonRight.png => buttonRightSelectedFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedSelectedButtonRight@2x.png => buttonRightSelectedFocused@2x.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedHelpButton.png => helpButtonFocused.png} (100%) rename platform/platform-impl/src/com/intellij/ide/ui/laf/icons/{focusedHelpButton@2x.png => helpButtonFocused@2x.png} (100%) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonLeft.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonLeft.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonLeft@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonLeft@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonLeft.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelected.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonLeft.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelected.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonLeft@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelected@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonLeft@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelected@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonLeft.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelectedFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonLeft.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelectedFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonLeft@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelectedFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonLeft@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonLeftSelectedFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonMiddle.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonMiddle.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonMiddle@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonMiddle@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonMiddle.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelected.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonMiddle.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelected.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonMiddle@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelected@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonMiddle@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelected@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonMiddle.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelectedFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonMiddle.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelectedFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonMiddle@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelectedFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonMiddle@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonMiddleSelectedFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonRight.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonRight.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonRight@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedButtonRight@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonRight.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelected.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonRight.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelected.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonRight@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelected@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/selectedButtonRight@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelected@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonRight.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelectedFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonRight.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelectedFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonRight@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelectedFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedSelectedButtonRight@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/buttonRightSelectedFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedHelpButton.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/helpButtonFocused.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedHelpButton.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/helpButtonFocused.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedHelpButton@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/helpButtonFocused@2x.png similarity index 100% rename from platform/platform-impl/src/com/intellij/ide/ui/laf/icons/focusedHelpButton@2x.png rename to platform/platform-impl/src/com/intellij/ide/ui/laf/icons/helpButtonFocused@2x.png diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java index 3c422c9f6301..f6551b60c04c 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJButtonUI.java @@ -15,7 +15,6 @@ */ package com.intellij.ide.ui.laf.intellij; -import com.intellij.ide.ui.laf.darcula.DarculaLaf; import com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI; import com.intellij.ui.Gray; import sun.swing.SwingUtilities2; @@ -34,21 +33,6 @@ public class MacIntelliJButtonUI extends DarculaButtonUI { private static Rectangle textRect = new Rectangle(); private static Rectangle iconRect = new Rectangle(); - private static final Icon LEFT = DarculaLaf.loadIcon("buttonLeft.png"); - private static final Icon RIGHT = DarculaLaf.loadIcon("buttonRight.png"); - private static final Icon MIDDLE = DarculaLaf.loadIcon("buttonMiddle.png"); - private static final Icon LEFT_SELECTED = DarculaLaf.loadIcon("selectedButtonLeft.png"); - private static final Icon RIGHT_SELECTED = DarculaLaf.loadIcon("selectedButtonRight.png"); - private static final Icon MIDDLE_SELECTED = DarculaLaf.loadIcon("selectedButtonMiddle.png"); - private static final Icon LEFT_FOCUSED = DarculaLaf.loadIcon("focusedButtonLeft.png"); - private static final Icon RIGHT_FOCUSED = DarculaLaf.loadIcon("focusedButtonRight.png"); - private static final Icon MIDDLE_FOCUSED = DarculaLaf.loadIcon("focusedButtonMiddle.png"); - private static final Icon LEFT_SELECTED_FOCUSED = DarculaLaf.loadIcon("focusedSelectedButtonLeft.png"); - private static final Icon RIGHT_SELECTED_FOCUSED = DarculaLaf.loadIcon("focusedSelectedButtonRight.png"); - private static final Icon MIDDLE_SELECTED_FOCUSED = DarculaLaf.loadIcon("focusedSelectedButtonMiddle.png"); - private static final Icon HELP_BUTTON = DarculaLaf.loadIcon("helpButton.png"); - private static final Icon HELP_BUTTON_FOCUSED = DarculaLaf.loadIcon("focusedHelpButton.png"); - @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"}) public static ComponentUI createUI(JComponent c) { return new MacIntelliJButtonUI(); @@ -59,7 +43,7 @@ public class MacIntelliJButtonUI extends DarculaButtonUI { int w = c.getWidth(); int h = c.getHeight(); if (isHelpButton(c)) { - Icon icon = c.hasFocus() ? HELP_BUTTON_FOCUSED : HELP_BUTTON; + Icon icon = MacIntelliJIconCache.getIcon("helpButton", false, c.hasFocus(), false); int x = (w - icon.getIconWidth()) / 2; int y = (h - icon.getIconHeight()) / 2; icon.paintIcon(c, g, x, y); @@ -79,22 +63,19 @@ public class MacIntelliJButtonUI extends DarculaButtonUI { int x = isFocused ? 0 : 2; int y = isFocused ? 0 : (h - viewRect.height) / 2; Icon icon; - icon = isDefault ? isFocused ? LEFT_SELECTED_FOCUSED : LEFT_SELECTED - : isFocused ? LEFT_FOCUSED : LEFT; + icon = MacIntelliJIconCache.getIcon("buttonLeft", isDefault, isFocused, false); icon.paintIcon(b, g, x, y); x += icon.getIconWidth(); - int stop = w - (isFocused ? 0 : 2) - (isFocused ? RIGHT_FOCUSED.getIconWidth() : RIGHT.getIconWidth()); + int stop = w - (isFocused ? 0 : 2) - (MacIntelliJIconCache.getIcon("buttonRight", isDefault, isFocused, false).getIconWidth()); Graphics gg = g.create(0, 0, w, h); gg.setClip(x, y, stop - x, h); - icon = isDefault ? isFocused ? MIDDLE_SELECTED_FOCUSED : MIDDLE_SELECTED - : isFocused ? MIDDLE_FOCUSED : MIDDLE; + icon = MacIntelliJIconCache.getIcon("buttonMiddle", isDefault, isFocused, false); while (x < stop) { icon.paintIcon(b, gg, x, y); x += icon.getIconWidth(); } gg.dispose(); - icon = isDefault ? isFocused ? RIGHT_SELECTED_FOCUSED : RIGHT_SELECTED - : isFocused ? RIGHT_FOCUSED : RIGHT; + icon = MacIntelliJIconCache.getIcon("buttonRight", isDefault, isFocused, false); icon.paintIcon(b, g, stop, y); clearTextShiftOffset();