From 97a75ab4a99e94a94bab8263bf12bbd617a220e9 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 15 Feb 2013 12:16:18 +0100
Subject: [PATCH] IDEA-98590 Modal Progress dialog is a bit too wide (wider
 than with default UI) and doesn't use small font for text2 +review CR-IC @kb

---
 .../intellij/openapi/progress/util/ProgressWindow.java   | 9 +++------
 platform/util/src/com/intellij/util/ui/UIUtil.java       | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

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 4d5ad9afe7ae..e3529b172e90 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
@@ -24,10 +24,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.DialogWrapperPeer;
 import com.intellij.openapi.ui.impl.FocusTrackbackProvider;
 import com.intellij.openapi.ui.impl.GlassPaneDialogWrapperPeer;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.EmptyRunnable;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
@@ -431,10 +428,10 @@ public class ProgressWindow extends BlockingProgressIndicator implements Disposa
     }
 
     private void initDialog(boolean shouldShowBackground, String cancelText) {
-      if (UIUtil.isUnderAquaLookAndFeel()) {
+      if (SystemInfo.isMac) {
         UIUtil.applyStyle(UIUtil.ComponentStyle.SMALL, myText2Label);
       }
-      myInnerPanel.setPreferredSize(new Dimension(UIUtil.isUnderAquaLookAndFeel() ? 350 : 450, -1));
+      myInnerPanel.setPreferredSize(new Dimension(SystemInfo.isMac ? 350 : 450, -1));
 
       myCancelButton.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index 8c00b416a998..94277a72dfd5 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -93,7 +93,7 @@ public class UIUtil {
 
     JComponent c = (JComponent)comp;
 
-    if (isUnderAquaLookAndFeel()) {
+    if (SystemInfo.isMac) {
       c.putClientProperty("JComponent.sizeVariant",
                           componentStyle == ComponentStyle.REGULAR ? "regular" : componentStyle == ComponentStyle.SMALL ? "small" : "mini");
     }