diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java index 3e1f8df3680e..605db4ff3317 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaCheckBoxUI.java @@ -31,14 +31,19 @@ import java.awt.*; * @author Konstantin Bulenkov */ public class DarculaCheckBoxUI extends MetalCheckBoxUI { - private static final Icon DEFAULT_ICON = JBUI.scale(EmptyIcon.create(19)).asUIResource(); + private static final Icon DEFAULT_ICON = JBUI.scale(EmptyIcon.create(18)).asUIResource(); @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") public static ComponentUI createUI(JComponent c) { + return new DarculaCheckBoxUI(); + } + + @Override + public void installUI(JComponent c) { + super.installUI(c); if (UIUtil.getParentOfType(CellRendererPane.class, c) != null) { c.setBorder(null); } - return new DarculaCheckBoxUI(); } @Override public void installDefaults(AbstractButton b) { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png index 582b1c45dec1..a74c7bd7a417 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox@2x.png index c8251f592b8b..ad3c70c3e913 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBox@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled.png index 879e9c9068fc..50dd4cec3eb8 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled@2x.png index c8dfb1c675d5..1960961fa8b0 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxDisabled@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused.png index 980e8864610b..d92177aa96e6 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused@2x.png index 1065832c8e7d..ce9161867ef8 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxFocused@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected.png index b33c37f62f14..d8c8e4a0cbb2 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected@2x.png index 450b6e2c692a..3650d9a8b732 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelected@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled.png index 33fe44899be0..c68a3a1175ba 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled@2x.png index 50262a043c25..79cfd0c3c614 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedDisabled@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused.png index d76b8d7eec80..65928d06d3d1 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused@2x.png index d05df7348fdf..0df1cc0c3e67 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxIndeterminateSelectedFocused@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected.png index 1b8aa0aa2114..d8579e16c83e 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected@2x.png index b86235dd00f1..01f89b8ff558 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelected@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled.png index 93e6b6ed7522..5998641a09ce 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled@2x.png index 54a31ddd76d8..f4805e212b1f 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedDisabled@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused.png index 98b635413d6d..eebd7c2ffd02 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused@2x.png b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused@2x.png index 400df1546ca6..f48e64e98f1c 100644 Binary files a/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused@2x.png and b/platform/platform-impl/src/com/intellij/ide/ui/laf/icons/darcula/checkBoxSelectedFocused@2x.png differ diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IntelliJCheckBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IntelliJCheckBoxUI.java new file mode 100644 index 000000000000..a3bc61e1a019 --- /dev/null +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/IntelliJCheckBoxUI.java @@ -0,0 +1,23 @@ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.ide.ui.laf.intellij; + +import com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI; +import com.intellij.util.ui.EmptyIcon; +import com.intellij.util.ui.JBUI; + +import javax.swing.*; +import javax.swing.plaf.ComponentUI; + +public class IntelliJCheckBoxUI extends DarculaCheckBoxUI { + private static final Icon DEFAULT_ICON = JBUI.scale(EmptyIcon.create(19)); + + @SuppressWarnings({"MethodOverridesStaticMethodOfSuperclass", "UnusedDeclaration"}) + public static ComponentUI createUI(JComponent c) { + return new IntelliJCheckBoxUI(); + } + + @Override + public Icon getDefaultIcon() { + return DEFAULT_ICON; + } +} diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties index fc1820594cb3..7cd01a169fbc 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties @@ -86,7 +86,7 @@ FormattedTextField.background=ffffff FormattedTextFieldUI=com.intellij.ide.ui.laf.darcula.ui.DarculaTextFieldUI FormattedTextField.border=com.intellij.ide.ui.laf.darcula.ui.DarculaTextBorder -CheckBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI +CheckBoxUI=com.intellij.ide.ui.laf.intellij.IntelliJCheckBoxUI CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI