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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2017-01-24 03:00:00 +03:00
parent 181f36567c ebc968da04
commit 00d112dc00
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/MacIntelliJTextFieldUI.java
+20 -1
View File
@@ -135,7 +135,26 @@ public class MacIntelliJTextFieldUI extends TextFieldWithPopupHandlerUI {
@Override
public Dimension getPreferredSize(JComponent c) {
Dimension size = super.getPreferredSize(c);
return new Dimension(size.width, Math.max(26, size.height));
return new Dimension(size.width + getIconsWidth(c), Math.max(26, size.height));
}
@Override
public Dimension getMinimumSize(JComponent c) {
Dimension minimumSize = super.getMinimumSize(c);
return new Dimension(minimumSize.width + getIconsWidth(c), minimumSize.height);
}
private int getIconsWidth(JComponent c) {
int width = 0;
if (isSearchField(c)) {
Icon label = getSearchIcon(c);
width += label.getIconWidth();
if (hasText()) {
Icon clearIcon = MacIntelliJIconCache.getIcon("searchFieldClear");
width += clearIcon.getIconWidth() + 3;
}
}
return width;
}
protected void paintSearchField(Graphics2D g, JTextComponent c, Rectangle r) {