MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-160900 Settings dialog doesn't fit the screen when using low screen resolution

Browse Source
This commit is contained in:
Sergey Malenkov
2017-03-28 01:39:55 +03:00
parent 84be24a53c
commit 8c2daa8802
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/options/newEditor/Banner.java
+2
View File
@@ -28,6 +28,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Dimension;
/**
* @author Sergey.Malenkov
@@ -39,6 +40,7 @@ final class Banner extends JPanel {
Banner(Action action) {
super(new BorderLayout(10, 0));
myLeftPanel.setLayout(new HorizontalLayout(5));
myProjectIcon.setMinimumSize(new Dimension(0, 0));
myProjectIcon.setIcon(AllIcons.General.ProjectConfigurableBanner);
myProjectIcon.setForeground(JBColor.GRAY);
myProjectIcon.setVisible(false);
platform/platform-impl/src/com/intellij/openapi/options/newEditor/ConfigurableEditor.java
+4 -1
View File
@@ -51,7 +51,10 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.util.ResourceBundle;
import static com.intellij.ui.ScrollPaneFactory.createScrollPane;
import static java.awt.Toolkit.getDefaultToolkit;
import static javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER;
import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED;
import static javax.swing.SwingUtilities.isDescendingFrom;
/**
@@ -296,7 +299,7 @@ class ConfigurableEditor extends AbstractEditor implements AnActionListener, AWT
}
}
}
return content;
return createScrollPane(content, VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_NEVER);
}
private static String getString(Configurable configurable, String key) {
platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
+10
View File
@@ -1041,6 +1041,16 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
else {
myLastMinimumSize = new Dimension(size);
JBInsets.addTo(size, window.getInsets());
Rectangle screen = ScreenUtil.getScreenRectangle(window);
if (size.width > screen.width || size.height > screen.height) {
Application application = ApplicationManager.getApplication();
if (application != null && application.isInternal()) {
LOG.warn("minimum size " + size.width + "x" + size.height +
" is bigger than screen " + screen.width + "x" + screen.height);
}
if (size.width > screen.width) size.width = screen.width;
if (size.height > screen.height) size.height = screen.height;
}
}
window.setMinimumSize(size);
}