From 53b1b4ddee493e6423c6e1e718ad7c687f94693c Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 14 Apr 2011 20:19:28 +0400
Subject: [PATCH] make big and small checked icons with respect to selection

---
 platform/icons/src/actions/checked.png        | Bin 135 -> 235 bytes
 .../icons/src/actions/checked_selected.png    | Bin 0 -> 234 bytes
 platform/icons/src/actions/checked_small.png  | Bin 0 -> 135 bytes
 .../src/actions/checked_small_selected.png    | Bin 0 -> 138 bytes
 .../OptionTableWithPreviewPanel.java          |   1 +
 .../JBComboBoxTableCellEditorComponent.java   |  22 ++++++++++++++----
 .../src/com/intellij/util/Icons.java          |   3 +++
 7 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 platform/icons/src/actions/checked_selected.png
 create mode 100644 platform/icons/src/actions/checked_small.png
 create mode 100644 platform/icons/src/actions/checked_small_selected.png

diff --git a/platform/icons/src/actions/checked.png b/platform/icons/src/actions/checked.png
index 366b1b532cd6ab984f9591ed3172ee1bb4659abc..0cdacea486cb9ae5b9e4e01efde54ce526cb9d98 100644
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1Gy`C<PAr-fh{`~)M&+OUIz~-j#jq#Dr1S^3wrG$GX3io)9
ztU7WdfM*ihqn8e6ST-|GXY*6A<2)kXFherUz>Zfj;PTc9u}y0n<vY?DHZq6QSqtPl
z^UI|0DyTnU{3xr?*Dz~cn?Ezh2ZoPqD;{}YP&m4pktL<!hp2#ha<_iWygbGv!5AqC
fPhTkpMmC1BFX@*%o1}|@4rB0i^>bP0l+XkKr@T#c

literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhex5FlAr-fh6C^YQc#f1eSj?H=
zl&Mh1d8GEpj9Y9+Zg-X*N>(sCpsL9fI)U}bM29`y6EYPY{>XLc3qRHrn89>pedCPD
i5=Z|y-0?14z|8Qlh9~cNQMNtMWCl-HKbLh*2~7YwW-R0Y

diff --git a/platform/icons/src/actions/checked_selected.png b/platform/icons/src/actions/checked_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..59042e8c0308ff7d7ae958c6681567dc9c46312a
GIT binary patch
literal 234
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GJ)SO(Ar-fh{`~)M&#c+d*<hnA@SCAfY@^gN#*b+VVXfT_
zb6S|i|F<{1bU4EzoPOjXyPtv`!;v=*IXp+|Id2LunZ|O*@*TUt{z%f{4a3uX_D8ul
zc$y6@8ZG!c-ZK=kTq!ZFk#d;9-eK+_8qbvE<|O41!PXJaSZK8F!eO-=Oh=S<m>5i&
eWx~M3!=T$MI_dDUGa*2CF?hQAxvX<aXaWGa;7+~(

literal 0
HcmV?d00001

diff --git a/platform/icons/src/actions/checked_small.png b/platform/icons/src/actions/checked_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..366b1b532cd6ab984f9591ed3172ee1bb4659abc
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhex5FlAr-fh6C^YQc#f1eSj?H=
zl&Mh1d8GEpj9Y9+Zg-X*N>(sCpsL9fI)U}bM29`y6EYPY{>XLc3qRHrn89>pedCPD
i5=Z|y-0?14z|8Qlh9~cNQMNtMWCl-HKbLh*2~7YwW-R0Y

literal 0
HcmV?d00001

diff --git a/platform/icons/src/actions/checked_small_selected.png b/platform/icons/src/actions/checked_small_selected.png
new file mode 100644
index 0000000000000000000000000000000000000000..7911a95b4192d5fbccfb0fe0eb375b7007778b50
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhfu1goAr-fh6C?ya{Qv(yL17>B
zk%uiJUd$i872YWyyJDtr&u@*e9P>s-Jx{?EO*#sFERSMae7G4OeRrstxnTJMsbvfw
mvlX7HxEb0Dd=HX&$MF7Yh}s_BT~R>889ZJ6T-G@yGywo8<SwHC

literal 0
HcmV?d00001

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
index 97289c509187..f324d6594b2c 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java
@@ -621,6 +621,7 @@ public abstract class OptionTableWithPreviewPanel extends MultilanguageCodeStyle
         }
       });
       myBooleanEditor.putClientProperty("JComponent.sizeVariant", "small");
+      myOptionsEditor.putClientProperty("JComponent.sizeVariant", "small");
     }
 
     public Object getCellEditorValue() {
diff --git a/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java b/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
index f14561de9384..5ba558f748fc 100644
--- a/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
+++ b/platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
@@ -42,18 +42,32 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
   private Object myValue;
 
   private ListCellRenderer myRenderer = new DefaultListCellRenderer() {
-    private Icon myCheckIcon = Icons.CHECK_ICON;
-    private Icon myEmptyIcon = EmptyIcon.create(Icons.CHECK_ICON.getIconWidth());
+    public Icon myEmptyIcon;
+
     @Override
     public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
       final JLabel label = (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
       if (value == myValue) {
-        label.setIcon(myCheckIcon);
+        label.setIcon(getIcon(isSelected));
       } else {
-        label.setIcon(myEmptyIcon);
+        label.setIcon(getEmptyIcon());
       }
       return label;
     }
+
+    private Icon getEmptyIcon() {
+      if (myEmptyIcon == null) {
+        myEmptyIcon = EmptyIcon.create(getIcon(true).getIconWidth());
+      }
+      return myEmptyIcon;
+    }
+
+    private Icon getIcon(boolean selected) {
+      final boolean small = "small".equals(JBComboBoxTableCellEditorComponent.this.getClientProperty("JComponent.sizeVariant"));
+      return small
+             ? selected ? Icons.CHECK_ICON_SMALL_SELECTED : Icons.CHECK_ICON_SMALL
+             : selected ? Icons.CHECK_ICON_SELECTED : Icons.CHECK_ICON;
+    }
   };
 
   public JBComboBoxTableCellEditorComponent() {
diff --git a/platform/platform-api/src/com/intellij/util/Icons.java b/platform/platform-api/src/com/intellij/util/Icons.java
index a7777e5a8357..92e2da2c473c 100644
--- a/platform/platform-api/src/com/intellij/util/Icons.java
+++ b/platform/platform-api/src/com/intellij/util/Icons.java
@@ -110,6 +110,9 @@ public abstract class Icons {
   public static final Icon SYNCHRONIZE_ICON = IconLoader.getIcon("/actions/sync.png");
 
   public static final Icon CHECK_ICON = IconLoader.getIcon("/actions/checked.png");
+  public static final Icon CHECK_ICON_SELECTED = IconLoader.getIcon("/actions/checked_selected.png");
+  public static final Icon CHECK_ICON_SMALL = IconLoader.getIcon("/actions/checked_small.png");
+  public static final Icon CHECK_ICON_SMALL_SELECTED = IconLoader.getIcon("/actions/checked_small_selected.png");
 
   public static final Icon OPEN_EDIT_DIALOG_ICON = IconLoader.getIcon("/actions/showViewer.png");
   public static final Icon FLATTEN_PACKAGES_ICON = IconLoader.getIcon("/objectBrowser/flattenPackages.png");