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

Fix combobox paddings and handle mouseExit for icons in ExtendableTextFields

Browse Source
This commit is contained in:
Kirill Kirichenko
2019-04-16 19:30:20 +03:00
parent c33f3bd167
commit c799da796e
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula.properties
+1 -1
View File
@@ -148,7 +148,7 @@ CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder
CheckBox.borderInsets=2,3,3,0
ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI
ComboBox.padding=1,5,1,5
ComboBox.padding=1,5,1,4
ComboBox.disabledBackground=3c3f41
ComboBox.disabledForeground=b1b1b1
ComboBox.nonEditableBackground=3c3f41
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+6 -1
View File
@@ -576,8 +576,13 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border, ErrorB
@Override
protected Rectangle rectangleForCurrentValue() {
Rectangle rect = super.rectangleForCurrentValue();
Rectangle rect = new Rectangle(comboBox.getSize());
Insets i = getInsets();
JBInsets.removeFrom(rect, i);
rect.width -= arrowButton != null ? (arrowButton.getWidth() - i.left) : rect.height;
JBInsets.removeFrom(rect, padding);
rect.width += comboBox.isEditable() ? 0 : padding.right;
return rect;
}
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java
+7
View File
@@ -334,6 +334,13 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple
}
}
@Override
public void mouseExited(MouseEvent e) {
if (!icons.isEmpty()) {
handleMouse(e, false);
}
}
@Override
public void mouseClicked(MouseEvent e) {
if (!icons.isEmpty()) {
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
+1 -1
View File
@@ -121,7 +121,7 @@ CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder
CheckBox.borderInsets=3,2,2,0
ComboBoxUI=com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI
ComboBox.padding=1,5,1,5
ComboBox.padding=1,5,1,4
ComboBox.disabledBackground=f2f2f2
ComboBox.disabledForeground=b1b1b1
ComboBox.nonEditableBackground=ffffff
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_mac.properties
+1 -1
View File
@@ -65,7 +65,7 @@ Spinner.border=com.intellij.ide.ui.laf.intellij.MacIntelliJSpinnerBorder
ComboBoxUI=com.intellij.ide.ui.laf.intellij.MacIntelliJComboBoxUI
ComboBox.border=com.intellij.ide.ui.laf.intellij.MacIntelliJComboBoxBorder
ComboBox.padding=1,5,1,5
ComboBox.padding=1,5,1,4
ComboBox.background=ffffff
ComboBox.disabledBackground=ececec
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
+1 -1
View File
@@ -123,7 +123,7 @@ CheckBox.border=com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxBorder
CheckBox.borderInsets=1,1,1,0
ComboBoxUI=com.intellij.ide.ui.laf.intellij.WinIntelliJComboBoxUI
ComboBox.padding=1,5,1,5
ComboBox.padding=1,5,1,4
ComboBox.disabledBackground=f2f2f2
RadioButtonUI=com.intellij.ide.ui.laf.intellij.WinIntelliJRadioButtonUI