From e542fb21a6b02bb8bfa86d869a05802c422331ad Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 24 May 2017 19:02:40 +0300 Subject: [PATCH] vcs: scale hardcoded dimensions under HiDPI --- .../vcs/actions/CompareWithSelectedRevisionAction.java | 7 ++++--- .../openapi/vcs/changes/SpecificFilesViewDialog.java | 3 ++- .../vcs/changes/committed/CommittedChangesBrowser.java | 3 ++- .../openapi/vcs/changes/ui/CommitChangeListDialog.java | 3 ++- .../vcs/configurable/VcsDirectoryConfigurationPanel.java | 2 +- .../src/com/intellij/openapi/vcs/history/DetailsPanel.java | 3 ++- .../vcs/history/impl/VcsSelectionHistoryDialog.java | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java index e58121d6c6b5..d1fd8320d3cf 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java @@ -37,6 +37,7 @@ import com.intellij.util.Consumer; import com.intellij.util.TreeItem; import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.ColumnInfo; +import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.ListTableModel; import com.intellij.vcsUtil.VcsUtil; import org.jetbrains.annotations.NotNull; @@ -270,7 +271,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { } }; - table.setMinimumSize(new Dimension(300, 50)); + table.setMinimumSize(new JBDimension(300, 50)); final PopupChooserBuilder builder = new PopupChooserBuilder(table); if (showComments) { @@ -280,7 +281,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { builder.setTitle(VcsBundle.message("lookup.title.vcs.file.revisions")). setItemChoosenCallback(runnable). setResizable(true). - setDimensionServiceKey("Vcs.CompareWithSelectedRevision.Popup").setMinSize(new Dimension(300, 300)); + setDimensionServiceKey("Vcs.CompareWithSelectedRevision.Popup").setMinSize(new JBDimension(300, 300)); final JBPopup popup = builder.createPopup(); popup.showCenteredInCurrentWindow(project); @@ -309,7 +310,7 @@ public class CompareWithSelectedRevisionAction extends AbstractVcsAction { commentLabel.setBorder(IdeBorderFactory.createBorder(SideBorder.TOP | SideBorder.LEFT | SideBorder.BOTTOM)); textScrollPane.setBorder(null); jPanel.add(textScrollPane, BorderLayout.CENTER); - jPanel.setPreferredSize(new Dimension(300, 100)); + jPanel.setPreferredSize(new JBDimension(300, 100)); return jPanel; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java index a1c4c7a94074..8af7cafd49c6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java @@ -35,6 +35,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.EditSourceOnEnterKeyHandler; +import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -82,7 +83,7 @@ abstract class SpecificFilesViewDialog extends DialogWrapper { init(); initData(initDataFiles); - myView.setMinimumSize(new Dimension(100, 100)); + myView.setMinimumSize(new JBDimension(100, 100)); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java index f0763f3dadf9..64f02ed77afe 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.ui.*; import com.intellij.ui.table.TableView; +import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; @@ -86,7 +87,7 @@ public class CommittedChangesBrowser extends JPanel { myCommitMessageArea = new JEditorPane(UIUtil.HTML_MIME, ""); myCommitMessageArea.setBackground(UIUtil.getComboBoxDisabledBackground()); myCommitMessageArea.addHyperlinkListener(BrowserHyperlinkListener.INSTANCE); - myCommitMessageArea.setPreferredSize(new Dimension(150, 100)); + myCommitMessageArea.setPreferredSize(new JBDimension(150, 100)); myCommitMessageArea.setEditable(false); JPanel commitPanel = new JPanel(new BorderLayout()); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 82fd1aaafbdb..bbbcf3d5ca54 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -49,6 +49,7 @@ import com.intellij.ui.SplitterWithSecondHideable; import com.intellij.util.Alarm; import com.intellij.util.ui.AbstractLayoutManager; import com.intellij.util.ui.GridBag; +import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -1011,7 +1012,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj @Override public Dimension getPreferredSize() { // we don't want to be squeezed to one line - return new Dimension(400, 120); + return new JBDimension(400, 120); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java index 6c3b23fe49df..df7284cdcd47 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java @@ -550,7 +550,7 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab return !myIsDisabled && onlyRegisteredRootsInSelection(); } }).disableUpDownActions().createPanel(); - panelForTable.setPreferredSize(new Dimension(-1, 200)); + panelForTable.setPreferredSize(new JBDimension(-1, 200)); return panelForTable; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/DetailsPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/DetailsPanel.java index 861fbf155182..985c2b71d3e8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/DetailsPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/DetailsPanel.java @@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.JBColor; import com.intellij.util.ui.HtmlPanel; +import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.StatusText; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -53,7 +54,7 @@ class DetailsPanel extends HtmlPanel implements DataProvider, CopyProvider { myStatusText.setText("Commit message"); myStatusText.attachTo(this); - setPreferredSize(new Dimension(150, 100)); + setPreferredSize(new JBDimension(150, 100)); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsSelectionHistoryDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsSelectionHistoryDialog.java index 30abeb051d67..89ef066d4f6f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsSelectionHistoryDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsSelectionHistoryDialog.java @@ -142,7 +142,7 @@ public class VcsSelectionHistoryDialog extends FrameWrapper implements DataProvi myHelpId = notNull(vcsHistoryProvider.getHelpId(), "reference.dialogs.vcs.selection.history"); myComments = new JEditorPane(UIUtil.HTML_MIME, ""); - myComments.setPreferredSize(new Dimension(150, 100)); + myComments.setPreferredSize(new JBDimension(150, 100)); myComments.setEditable(false); myComments.addHyperlinkListener(BrowserHyperlinkListener.INSTANCE);