vcs: scale hardcoded dimensions under HiDPI

This commit is contained in:
Aleksey Pivovarov
2017-05-24 19:06:21 +03:00
parent c09290fb84
commit e542fb21a6
7 changed files with 14 additions and 9 deletions
@@ -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;
}
@@ -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));
}
@@ -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());
@@ -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);
}
}
@@ -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;
}
@@ -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
@@ -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);