From ea0ca63b68a0154d94a02db0cb4bc7c0db6dc70d Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Thu, 5 Nov 2015 21:43:26 +0300
Subject: [PATCH] IDEA-141246 fix cancel button position for DFM progress
 indicator

---
 .../wm/impl/status/PresentationModeProgressPanel.form  | 10 ++++++----
 .../wm/impl/status/PresentationModeProgressPanel.java  |  3 ---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.form b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.form
index d3b9897ea43b..9b3015428a08 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.form
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.form
@@ -16,8 +16,9 @@
       <component id="21ac6" class="javax.swing.JLabel" binding="myText">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="225" height="-1"/>
-            <maximum-size width="225" height="-1"/>
+            <minimum-size width="209" height="-1"/>
+            <preferred-size width="209" height="-1"/>
+            <maximum-size width="209" height="-1"/>
           </grid>
         </constraints>
         <properties>
@@ -49,8 +50,9 @@
       <component id="34af0" class="javax.swing.JLabel" binding="myText2">
         <constraints>
           <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="225" height="-1"/>
-            <maximum-size width="225" height="-1"/>
+            <minimum-size width="209" height="-1"/>
+            <preferred-size width="209" height="-1"/>
+            <maximum-size width="209" height="-1"/>
           </grid>
         </constraints>
         <properties>
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.java
index e265adc21727..fb36b901bf65 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PresentationModeProgressPanel.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.InplaceButton;
 import com.intellij.ui.TransparentPanel;
-import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.update.MergingUpdateQueue;
 import com.intellij.util.ui.update.Update;
@@ -52,8 +51,6 @@ public class PresentationModeProgressPanel {
     Font font = JBUI.Fonts.label(11);
     myText.setFont(font);
     myText2.setFont(font);
-    myText.setIcon(EmptyIcon.create(1, 16));
-    myText2.setIcon(EmptyIcon.create(1, 16));
     myUpdateQueue = new MergingUpdateQueue("Presentation Mode Progress", 100, true, null);
     myUpdate = new Update("Update UI") {
       @Override