From cfc124a4a9d8ba3176c2ba8a107dcdf4bdd36137 Mon Sep 17 00:00:00 2001
From: Sven Ritter <unknown>
Date: Thu, 12 Jun 2025 10:54:21 +1000
Subject: Bug [#2482]. Force list colours to be opaque. Enlarge bitmap to avoid
 visible blank background between items.

---
 doc/ScintillaHistory.html | 14 ++++++++++++++
 win32/ListBox.cxx         |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 5f0901b7a..d4dfa7943 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -590,9 +590,23 @@
 	<td>8day</td>
       </tr><tr>
 	<td>Ahmet Sait</td>
+	<td>Sven Ritter</td>
     </tr>
     </table>
     <h2 id="Releases">Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla558.zip">Release 5.5.8</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 June 2025.
+	</li>
+	<li>
+	On Win32, force autocompletion list colours to be opaque.
+	Enlarge bitmap to avoid visible blank background between items.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2482/">Bug #2482</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla557.zip">Release 5.5.7</a>
     </h3>
diff --git a/win32/ListBox.cxx b/win32/ListBox.cxx
index 38806a373..b04e0c86f 100644
--- a/win32/ListBox.cxx
+++ b/win32/ListBox.cxx
@@ -119,7 +119,7 @@ const TCHAR ListBoxX_ClassName[] = TEXT("ListBoxX");
 
 ColourRGBA ColourElement(std::optional<ColourRGBA> colour, int nIndex) {
 	if (colour.has_value()) {
-		return colour.value();
+		return colour.value().Opaque();
 	}
 	return ColourFromSys(nIndex);
 }
@@ -743,7 +743,7 @@ void ListBoxX::CentreItem(int n) {
 }
 
 void ListBoxX::AllocateBitMap() {
-	const SIZE extent { GetClientExtent().x, lineHeight };
+	const SIZE extent { GetClientExtent().x, ItemHeight() };
 
 	graphics.bm.Create({}, extent.cx, -extent.cy, nullptr);
 	if (!graphics.bm) {
-- 
cgit v1.2.3