From 10e71119895462e4acf9229a5f06444ac9dcaec5 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 4 Apr 2014 14:53:02 +0400 Subject: [PATCH 1/3] IDEA-123402 Sheet dialogs are too transparent, making it hard to read the content --- .../src/com/intellij/ui/messages/SheetController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java index 7da15f27da28..72d2d85d9f8e 100755 --- a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java +++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java @@ -197,7 +197,7 @@ public class SheetController { } private static float getSheetAlpha() { - return ((UIUtil.isUnderDarcula())) ? .95f : .85f; + return .95f; } private JPanel createSheetPanel(String title, String message, JButton[] buttons) { @@ -208,7 +208,7 @@ public class SheetController { super.paintComponent(g); g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, getSheetAlpha())); - g.setColor(new JBColor(Gray._225, UIUtil.getPanelBackground())); + g.setColor(new JBColor(Gray._230, UIUtil.getPanelBackground())); Rectangle2D dialog = new Rectangle2D.Double(SHADOW_BORDER, 0, SHEET_WIDTH, SHEET_HEIGHT); paintShadow(g); From 37c7f51be2a957bd28eee6a85fa8939d66b8ce22 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 4 Apr 2014 14:54:38 +0400 Subject: [PATCH 2/3] Expression simplification --- .../src/com/intellij/ui/messages/SheetController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java index 72d2d85d9f8e..89572955424a 100755 --- a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java +++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java @@ -93,7 +93,7 @@ public class SheetController { } myDoNotAskOption = doNotAskOption; - myDoNotAskResult = (doNotAskOption == null) ? false : !doNotAskOption.isToBeShown(); + myDoNotAskResult = (doNotAskOption != null) && !doNotAskOption.isToBeShown(); mySheetMessage = sheetMessage; buttons = new JButton[buttonTitles.length]; From 129e7609899a79d9969c03e7d8156c3f72f43507 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Fri, 4 Apr 2014 15:09:55 +0400 Subject: [PATCH 3/3] Narrowing the top shadow, shadows are lighter for IDEA-122991 --- .../src/com/intellij/ui/messages/SheetController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java index 89572955424a..c677e9c31901 100755 --- a/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java +++ b/platform/platform-impl/src/com/intellij/ui/messages/SheetController.java @@ -142,7 +142,7 @@ public class SheetController { ShadowRenderer renderer = new ShadowRenderer(); renderer.setSize(SHADOW_BORDER); - renderer.setOpacity(.75f); + renderer.setOpacity(.80f); renderer.setColor(new JBColor(JBColor.BLACK, Gray._10)); myShadowImage = renderer.createShadow(mySheetStencil); } @@ -348,7 +348,7 @@ public class SheetController { private void paintShadowFromParent(Graphics2D g2d) { g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, getShadowAlpha())); - g2d.drawImage(myShadowImage, 0, - SHEET_HEIGHT, null); + g2d.drawImage(myShadowImage, 0, - SHEET_HEIGHT - SHADOW_BORDER, null); } private void layoutButtons(final JButton[] buttons, JPanel panel) {