From 851c89955a5e8af194a0200ba011c2dcdb7b5757 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 28 Nov 2012 07:43:40 +0100 Subject: [PATCH] new borders and default button ui (cherry-picked from 12e15fa) --- .../ide/ui/laf/darcula/darcula.properties | 2 +- .../ui/laf/darcula/darcula_linux.properties | 10 +------- .../ide/ui/laf/darcula/darcula_mac.properties | 1 + .../ui/laf/darcula/darcula_windows.properties | 6 +---- .../laf/darcula/ui/DarculaButtonPainter.java | 4 +-- .../ui/laf/darcula/ui/DarculaButtonUI.java | 25 ++++++++----------- 6 files changed, 17 insertions(+), 31 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties index 794a240cf3a0..8a400c603346 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties @@ -69,7 +69,7 @@ StatusBar.top2Color=2c2c2c StatusBar.bottomColor=2c2c2c Button.border=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonPainter -#ButtonUI=com.intellij.ide.ui.laf.borders.DarculaButtonUI +ButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI MenuItem.acceleratorForeground=eeeeee PopupMenu.translucentBackground=3c3f41 diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_linux.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_linux.properties index fce5afb2695e..85d48e5b07ab 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_linux.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_linux.properties @@ -1,15 +1,7 @@ +# suppress inspection "UnusedProperty" for whole file darcula.selectionBackground=2F65CA darcula.selectionForeground=bbbbbb -ButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI -# -#Tree.line=909090 -#Tree.hash=909090 -#Tree.collapsedIcon=AllIcons.Darcula.TreeNodeCollapsed -#Tree.expandedIcon=AllIcons.Darcula.TreeNodeExpanded - PopupMenu.border=com.intellij.ide.ui.laf.darcula.ui.DarculaPopupMenuBorder MenuBar.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuBarBorder - -#PanelUI=com.intellij.ide.ui.laf.darcula.ui.DarculaPanelUI \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties index 40812f57695b..32f21a8df73c 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties @@ -1,2 +1,3 @@ +# suppress inspection "UnusedProperty" for whole file darcula.selectionBackground=2F65CA Menu.arrowIcon=AllIcons.Mac.Tree_white_right_arrow \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties index 1b1474ae452f..5c4e881bd8e1 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_windows.properties @@ -1,11 +1,7 @@ +# suppress inspection "UnusedProperty" for whole file darcula.selectionBackground=4B6EAF darcula.selectionForeground=bbbbbb -ButtonUI=com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI - -Tree.line=909090 -Tree.hash=909090 - PopupMenu.border=com.intellij.ide.ui.laf.darcula.ui.DarculaPopupMenuBorder MenuBar.border=com.intellij.ide.ui.laf.darcula.ui.DarculaMenuBarBorder \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java index 2546a059a3c1..0abfa4fd612e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonPainter.java @@ -43,9 +43,9 @@ public class DarculaButtonPainter implements Border, UIResource { g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_DEFAULT); g2d.setPaint(new GradientPaint(width / 2, y + yOff + 1, Gray._80.withAlpha(90), width / 2, height - 2*yOff, Gray._90.withAlpha(90))); - g.drawRoundRect(x + offset + 1, y + yOff + 1, width - 2 * offset, height - 2*yOff, 5, 5); + //g.drawRoundRect(x + offset + 1, y + yOff + 1, width - 2 * offset, height - 2*yOff, 5, 5); - ((Graphics2D)g).setPaint(Gray._40.withAlpha(180)); + ((Graphics2D)g).setPaint(Gray._100.withAlpha(180)); g.drawRoundRect(x + offset, y + yOff, width - 2 * offset, height - 2*yOff, 5, 5); config.restore(); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java index 3387e25a6616..efaffdb41f9a 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java @@ -32,21 +32,18 @@ public class DarculaButtonUI extends BasicButtonUI { @Override public void paint(Graphics g, JComponent c) { - if (c.isEnabled()) { - final Border border = c.getBorder(); - if (border != null) { - final Insets ins = border.getBorderInsets(c); - final int yOff = (ins.top + ins.bottom) / 4; - if (((JButton)c).isDefaultButton()) { - ((Graphics2D)g).setPaint(new GradientPaint(0, 0, new Color(0x384F6B), 0, c.getHeight(), new Color(0x233143))); - } else { - ((Graphics2D)g).setPaint(new GradientPaint(0, 0, new Color(85, 90, 92), 0, c.getHeight(), new Color(65, 70, 72))); - } - g.fillRoundRect(5, yOff + 1, c.getWidth() - 2 * 4, c.getHeight() - 2 * yOff, 5, 5); + final Border border = c.getBorder(); + if (c.isEnabled() && border != null) { + final Insets ins = border.getBorderInsets(c); + final int yOff = (ins.top + ins.bottom) / 4; + if (((JButton)c).isDefaultButton()) { + ((Graphics2D)g).setPaint(new GradientPaint(0, 0, new Color(0x384F6B), 0, c.getHeight(), new Color(0x233143))); } + else { + ((Graphics2D)g).setPaint(new GradientPaint(0, 0, new Color(85, 90, 92), 0, c.getHeight(), new Color(65, 70, 72))); + } + g.fillRoundRect(4, yOff, c.getWidth() - 2 * 4, c.getHeight() - 2 * yOff, 5, 5); } - super.paint(g,c); + super.paint(g, c); } - - }