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-171869 FixedSizeButton bounds fixed

Browse Source
This commit is contained in:
Kirill Kirichenko
2017-05-31 15:34:54 +03:00
parent 5ef10ef1fd
commit abdd7bb71e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/ui/FixedSizeButton.java
+3 -3
View File
@@ -16,7 +16,6 @@
package com.intellij.openapi.ui;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -87,9 +86,10 @@ public class FixedSizeButton extends JButton {
}
public Dimension getPreferredSize() {
if (myComponent != null && !UIUtil.isUnderWin10LookAndFeel()) { // On Win10 LaF rely on UI defined size.
if (myComponent != null) {
int size = myComponent.getPreferredSize().height;
if (myComponent instanceof JComboBox && (!SystemInfo.isMac && UIUtil.isUnderIntelliJLaF() || UIUtil.isUnderDarcula())) {
if (myComponent instanceof JComboBox &&
!(UIUtil.isUnderDefaultMacTheme() || UIUtil.isUnderWin10LookAndFeel()) || UIUtil.isUnderDarcula()) {
// JComboBox's preferred height is 2px greater than JTextField's one, because
// javax.swing.DefaultListCellRenderer#getNoFocusBorder returns (1,1,1,1) border.
// Decrement to have equal sizes for pretty look when stacked vertically