From 823c26364512b80fa85ab22e491bb16937eb27d7 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Thu, 12 Jul 2012 14:22:17 +0200
Subject: [PATCH] Platform: border around glass-pane progress + progress dialog
 is always the same size now (I hope)

---
 .../openapi/progress/util/ProgressWindow.form         |  2 +-
 .../openapi/progress/util/ProgressWindow.java         | 11 ++++++-----
 .../intellij/openapi/ui/impl/ShadowBorderPainter.java |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form
index f8dd161bfa08..533fd88b7bf4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.form
@@ -18,7 +18,7 @@
         </properties>
         <border type="none"/>
         <children>
-          <grid id="2694" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="2694" binding="myInnerPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="2" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
index 3392c1bfc71c..53221843a101 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
@@ -411,10 +411,11 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
 
     private JProgressBar myProgressBar;
     private boolean myRepaintedFlag = true;
-    private       TitlePanel    myTitlePanel;
-    private       DialogWrapper myPopup;
-    private final Window        myParentWindow;
-    private       Point         myLastClicked;
+    private TitlePanel myTitlePanel;
+    private JPanel myInnerPanel;
+    private DialogWrapper myPopup;
+    private final Window myParentWindow;
+    private Point myLastClicked;
 
     public MyDialog(boolean shouldShowBackground, Project project, String cancelText) {
       Window parentWindow = WindowManager.getInstance().suggestParentWindow(project);
@@ -437,7 +438,7 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
       if (UIUtil.isUnderAquaLookAndFeel()) {
         UIUtil.applyStyle(UIUtil.ComponentStyle.SMALL, myText2Label);
       }
-      myProgressBar.setPreferredSize(new Dimension(UIUtil.isUnderAquaLookAndFeel() ? 350 : 450, -1));
+      myInnerPanel.setPreferredSize(new Dimension(UIUtil.isUnderAquaLookAndFeel() ? 350 : 450, -1));
 
       myCancelButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
index 7956349c965f..214db85bf92f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
@@ -94,6 +94,10 @@ public class ShadowBorderPainter {
       right.paintIcon(c, g, width - sideSize, _y);
     }
 
+    g.setColor(new Color(0, 0, 0, 30));
+    g.drawRect(SIDE_SIZE - 1, TOP_SIZE - 1,
+               width - SIDE_SIZE * 2 + 1, height - TOP_SIZE - BOTTOM_SIZE + 1);
+
     g.dispose();
     return image;
   }