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

combobox button does not restore font and size settings

Browse Source
This commit is contained in:
Konstantin Bulenkov
2014-06-26 17:16:10 +04:00
parent 42dc2e5218
commit f8663dd460
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+11 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 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.
@@ -284,9 +284,10 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
@Override
public void updateUI() {
super.updateUI();
if (!UIUtil.isUnderGTKLookAndFeel()) {
setBorder(UIUtil.getButtonBorder());
}
//if (!UIUtil.isUnderGTKLookAndFeel()) {
// setBorder(UIUtil.getButtonBorder());
//}
//((JComponent)getParent().getParent()).revalidate();
}
protected class MyButtonModel extends DefaultButtonModel {
@@ -358,6 +359,11 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
return new Dimension(width, isSmallVariant() ? 19 : UIUtil.isUnderNimbusLookAndFeel() ? 24 : 21);
}
@Override
public Font getFont() {
return SystemInfo.isMac ? UIUtil.getLabelFont(UIUtil.FontSize.SMALL) : UIUtil.getLabelFont();
}
@Override
public void paint(Graphics g) {
GraphicsUtil.setupAntialiasing(g);
@@ -440,6 +446,7 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
protected void updateButtonSize() {
invalidate();
repaint();
setSize(getPreferredSize());
}
}
}