From 4cbae3e3a52f6927597e7da2b156bc2463960b05 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Tue, 28 Feb 2017 19:54:40 +0300
Subject: [PATCH] schemes ui: use scaled values

---
 .../options/schemes/AbstractSchemesPanel.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
index 9d635fa56499..800cf9fc2990 100644
--- a/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
@@ -29,6 +29,8 @@ import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.awt.RelativePoint;
+import com.intellij.util.ui.JBDimension;
+import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -67,23 +69,23 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
     JPanel controlsPanel = new JPanel();
     controlsPanel.setLayout(new BoxLayout(controlsPanel, BoxLayout.LINE_AXIS));
     controlsPanel.add(new JLabel(getSchemeTypeName() + ":"));
-    controlsPanel.add(Box.createRigidArea(new Dimension(10, 0)));
+    controlsPanel.add(Box.createRigidArea(new JBDimension(10, 0)));
     myActions = createSchemeActions();
     mySchemesCombo = new EditableSchemesCombo<>(this);
     controlsPanel.add(mySchemesCombo.getComponent());
     myToolbar = createToolbar();
-    controlsPanel.add(Box.createRigidArea(new Dimension(6, 0)));
+    controlsPanel.add(Box.createRigidArea(new JBDimension(6, 0)));
     controlsPanel.add(myToolbar);
-    controlsPanel.add(Box.createRigidArea(new Dimension(9, 0)));
+    controlsPanel.add(Box.createRigidArea(new JBDimension(9, 0)));
     myInfoComponent = createInfoComponent();
     controlsPanel.add(myInfoComponent);
     controlsPanel.add(Box.createHorizontalGlue());
     controlsPanel.setMaximumSize(new Dimension(controlsPanel.getMaximumSize().width, mySchemesCombo.getComponent().getPreferredSize().height));
     add(controlsPanel);
-    add(Box.createRigidArea(new Dimension(0, 12)));
+    add(Box.createRigidArea(new JBDimension(0, 12)));
     add(new JSeparator());
     add(Box.createVerticalGlue());
-    add(Box.createRigidArea(new Dimension(0, 10)));
+    add(Box.createRigidArea(new JBDimension(0, 10)));
   }
   
   private JComponent createToolbar() {
@@ -210,7 +212,7 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
     public void actionPerformed(AnActionEvent e) {
       final ListPopup actionGroupPopup =
         JBPopupFactory.getInstance().createActionGroupPopup(null, myActionGroup, e.getDataContext(), true, null, Integer.MAX_VALUE);
-      actionGroupPopup.show(new RelativePoint(myParentComponent, new Point(2, myParentComponent.getHeight() - 1)));
+      actionGroupPopup.show(new RelativePoint(myParentComponent, new Point(JBUI.scale(2), myParentComponent.getHeight() - JBUI.scale(1))));
     }
   }
 }