From 5d974fef37a82c31b1918ec674ef8d64ff47e5b8 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Tue, 27 Aug 2019 12:49:26 +0200
Subject: [PATCH] ComboBox: fixed background if explicit color is set (for not
 editable combobox)

---
 .../main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
index 1a928126..3770d9b2 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
@@ -234,6 +234,12 @@ public class FlatComboBoxUI
 		super.paintCurrentValue( g, bounds, false );
 	}
 
+	@Override
+	public void paintCurrentValueBackground( Graphics g, Rectangle bounds, boolean hasFocus ) {
+		g.setColor( comboBox.isEnabled() ? comboBox.getBackground() : disabledBackground );
+		g.fillRect( bounds.x, bounds.y, bounds.width, bounds.height );
+	}
+
 	//---- class FlatArrowButton ----------------------------------------------
 
 	private class FlatArrowButton