Merge remote-tracking branch 'origin/master'

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"/>

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) {

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;
   }

platform/platform-resources-en/src/messages/XDebuggerBundle.properties

@@ -53,6 +53,7 @@ dialog.title.evaluate.code.fragment=Evaluate Code Fragment
 button.text.code.fragment.mode=Code Fragment &Mode
 button.text.expression.mode=Expression &Mode
 xdebugger.label.text.code.fragment=Code fragment:
+xdebugger.evaluate.result=result
 
 xdebugger.popup.value.tree.set.root.action.tooltip=Set As Root
 

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/EvaluatingExpressionRootNode.java

@@ -15,6 +15,8 @@
  */
 package com.intellij.xdebugger.impl.ui.tree.nodes;
 
+import com.intellij.util.ui.UIUtil;
+import com.intellij.xdebugger.XDebuggerBundle;
 import com.intellij.xdebugger.frame.XCompositeNode;
 import com.intellij.xdebugger.frame.XValue;
 import com.intellij.xdebugger.frame.XValueChildrenList;
@@ -44,10 +46,10 @@ public class EvaluatingExpressionRootNode extends XValueContainerNode<Evaluating
     }
 
     public void computeChildren(@NotNull final XCompositeNode node) {
-      final String resultName = myDialog.getExpression();
       myDialog.startEvaluation(new XEvaluationCallbackBase() {
         public void evaluated(@NotNull final XValue result) {
-          node.addChildren(XValueChildrenList.singleton(resultName, result), true);
+          String name = UIUtil.removeMnemonic(XDebuggerBundle.message("xdebugger.evaluate.result"));
+          node.addChildren(XValueChildrenList.singleton(name, result), true);
         }
 
         public void errorOccurred(@NotNull final String errorMessage) {