mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
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
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user