|
|
@ -277,17 +277,16 @@ public class DarkComboBoxUI extends BasicComboBoxUI implements Border { |
|
|
|
if (comboBox.isEditable()) { |
|
|
|
if (comboBox.isEditable()) { |
|
|
|
var arrowBounds = arrowButton.getBounds(); |
|
|
|
var arrowBounds = arrowButton.getBounds(); |
|
|
|
boolean leftToRight = comboBox.getComponentOrientation().isLeftToRight(); |
|
|
|
boolean leftToRight = comboBox.getComponentOrientation().isLeftToRight(); |
|
|
|
int off = leftToRight ? arrowBounds.x : arrowBounds.x + arrowBounds.width - 1; |
|
|
|
int off = leftToRight ? arrowBounds.x : arrowBounds.x + arrowBounds.width; |
|
|
|
Area rect; |
|
|
|
Area rect; |
|
|
|
Area iconRect; |
|
|
|
Area iconRect; |
|
|
|
if (!isTableCellEditor && !isTreeCellEditor) { |
|
|
|
if (!isTableCellEditor && !isTreeCellEditor) { |
|
|
|
rect = new Area(new RoundRectangle2D.Double(bSize, bSize, width - 2 * bSize, |
|
|
|
rect = new Area(new RoundRectangle2D.Double(bSize, bSize, width - 2 * bSize, |
|
|
|
height - 2 * bSize, arc, arc)); |
|
|
|
height - 2 * bSize, arc, arc)); |
|
|
|
iconRect = new Area(new Rectangle(off, bSize, width - 2 * bSize - off + 1, |
|
|
|
iconRect = new Area(new Rectangle(off, 0, width, height)); |
|
|
|
height - 2 * bSize)); |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
rect = new Area(new Rectangle(0, 0, width, height)); |
|
|
|
rect = new Area(new Rectangle(0, 0, width, height)); |
|
|
|
iconRect = new Area(new Rectangle(off, 0, width - off + 1, height)); |
|
|
|
iconRect = new Area(new Rectangle(off, 0, width, height)); |
|
|
|
} |
|
|
|
} |
|
|
|
if (leftToRight) { |
|
|
|
if (leftToRight) { |
|
|
|
rect.intersect(iconRect); |
|
|
|
rect.intersect(iconRect); |
|
|
|