From f1b04d96df375acff84fb4633c8abd36b5dd1c04 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 11 Apr 2016 22:31:36 +0200 Subject: [PATCH] DPI-aware empty borders --- .../src/com/intellij/dvcs/ui/BranchActionGroupPopup.java | 7 ++++--- plugins/devkit/src/build/PluginModuleBuildConfEditor.java | 2 +- .../devkit/src/testAssistant/TestDataGroupFileEditor.java | 3 ++- .../src/git4idea/ui/branch/GitCompareBranchesLogPanel.java | 5 +++-- .../jetbrains/plugins/github/ui/GithubSettingsPanel.java | 5 +++-- .../actions/AddGradleDslPluginActionHandler.java | 5 +++-- 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java index a0950e33bb65..5405c7a00c6f 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import com.intellij.ui.components.panels.OpaquePanel; import com.intellij.ui.popup.PopupFactoryImpl; import com.intellij.ui.popup.WizardPopup; import com.intellij.ui.popup.list.PopupListElementRenderer; +import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -94,11 +95,11 @@ public class BranchActionGroupPopup extends PopupFactoryImpl.ActionGroupPopup { protected JComponent createItemComponent() { myTextLabel = new ErrorLabel(); myTextLabel.setOpaque(true); - myTextLabel.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1)); + myTextLabel.setBorder(JBUI.Borders.empty(1)); myBranchLabel = new ErrorLabel(); myBranchLabel.setOpaque(true); - myBranchLabel.setBorder(BorderFactory.createEmptyBorder(1, UIUtil.DEFAULT_HGAP, 1, 1)); + myBranchLabel.setBorder(JBUI.Borders.empty(1, UIUtil.DEFAULT_HGAP, 1, 1)); JPanel compoundPanel = new OpaquePanel(new BorderLayout(), JBColor.WHITE); compoundPanel.add(myTextLabel, BorderLayout.CENTER); diff --git a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java index be4c0df8d423..7c686bd8e8e7 100644 --- a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java +++ b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java @@ -83,7 +83,7 @@ public class PluginModuleBuildConfEditor implements ModuleConfigurationEditor { gc.weighty = 1.0; manifestPanel.add(myManifest, gc); myWholePanel.add(manifestPanel, gc); - myWholePanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + myWholePanel.setBorder(JBUI.Borders.empty(5)); return myWholePanel; } diff --git a/plugins/devkit/src/testAssistant/TestDataGroupFileEditor.java b/plugins/devkit/src/testAssistant/TestDataGroupFileEditor.java index 2c9f5c084f1c..dcfdb79a3aab 100644 --- a/plugins/devkit/src/testAssistant/TestDataGroupFileEditor.java +++ b/plugins/devkit/src/testAssistant/TestDataGroupFileEditor.java @@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.reference.SoftReference; +import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -66,7 +67,7 @@ public class TestDataGroupFileEditor extends UserDataHolderBase implements FileE private static JComponent wrapWithTitle(String name, final FileEditor beforeEditor) { JPanel panel = new JPanel(new BorderLayout()); final JLabel label = new JLabel(name); - label.setBorder(BorderFactory.createEmptyBorder(1, 4, 2, 0)); + label.setBorder(JBUI.Borders.empty(1, 4, 2, 0)); label.setFont(label.getFont().deriveFont(Font.BOLD)); panel.add(BorderLayout.NORTH, label); panel.add(BorderLayout.CENTER, beforeEditor.getComponent()); diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesLogPanel.java b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesLogPanel.java index 8b34b13fb353..fe89155e8bc0 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesLogPanel.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesLogPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.ui.components.JBLabel; import com.intellij.util.ArrayUtil; import com.intellij.util.Consumer; +import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import git4idea.GitCommit; import git4idea.repo.GitRepository; @@ -161,7 +162,7 @@ class GitCompareBranchesLogPanel extends JPanel { JPanel bth = new JPanel(new BorderLayout()); JBLabel descriptionLabel = new JBLabel(desc, UIUtil.ComponentStyle.SMALL); - descriptionLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); + descriptionLabel.setBorder(JBUI.Borders.emptyBottom(5)); bth.add(descriptionLabel, BorderLayout.NORTH); bth.add(forward ? myHeadToBranchListPanel : myBranchToHeadListPanel); return bth; diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java index 64a5654d50f2..cfdb5243da56 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import com.intellij.ui.DocumentAdapter; import com.intellij.ui.HyperlinkAdapter; import com.intellij.ui.components.JBCheckBox; import com.intellij.ui.components.JBLabel; +import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.github.api.GithubApiUtil; @@ -85,7 +86,7 @@ public class GithubSettingsPanel { mySignupTextField.setText("Do not have an account at github.com? " + "Sign up" + ""); mySignupTextField.setBackground(myPane.getBackground()); mySignupTextField.setCursor(new Cursor(Cursor.HAND_CURSOR)); - myAuthTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); + myAuthTypeLabel.setBorder(JBUI.Borders.emptyLeft(10)); myAuthTypeComboBox.addItem(AUTH_PASSWORD); myAuthTypeComboBox.addItem(AUTH_TOKEN); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionHandler.java index 540fdc9a878e..774b0b4a330e 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionHandler.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.components.JBList; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.gradle.util.GradleBundle; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; @@ -130,7 +131,7 @@ class AddGradleDslPluginActionHandler implements CodeInsightActionHandler { public MyListCellRenderer() { myPanel = new JPanel(new BorderLayout()); - myPanel.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); + myPanel.setBorder(JBUI.Borders.emptyLeft(2)); myNameLabel = new JLabel(); myPanel.add(myNameLabel, BorderLayout.WEST);