From d6f80fb1137d7cf42939fb55e35f4ba1060d4beb Mon Sep 17 00:00:00 2001
From: John Horigan <unknown>
Date: Sun, 21 Oct 2018 14:43:07 +1100
Subject: Bug [#2055]. Use dark info bar background when system is set to Dark
 Appearance.

---
 cocoa/InfoBar.mm             |   5 ++++-
 cocoa/res/info_bar_bg.png    | Bin 3081 -> 1221 bytes
 cocoa/res/info_bar_bg@2x.png | Bin 2921 -> 1284 bytes
 doc/ScintillaHistory.html    |   5 +++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cocoa/InfoBar.mm b/cocoa/InfoBar.mm
index 07949c3ee..9fa1a19aa 100644
--- a/cocoa/InfoBar.mm
+++ b/cocoa/InfoBar.mm
@@ -223,12 +223,15 @@ static float BarFontSize = 10.0;
  * Fill the background.
  */
 - (void) drawRect: (NSRect) rect {
+	[[NSColor controlBackgroundColor] set];
+	[NSBezierPath fillRect: rect];
+
 	// Since the background is seamless, we don't need to take care for the proper offset.
 	// Simply tile the background over the invalid rectangle.
 	if (mBackground.size.width != 0) {
 		NSPoint target = {rect.origin.x, 0};
 		while (target.x < rect.origin.x + rect.size.width) {
-			[mBackground drawAtPoint: target fromRect: NSZeroRect operation: NSCompositingOperationCopy fraction: 1];
+			[mBackground drawAtPoint: target fromRect: NSZeroRect operation: NSCompositingOperationSourceOver fraction: 1];
 			target.x += mBackground.size.width;
 		}
 	}
diff --git a/cocoa/res/info_bar_bg.png b/cocoa/res/info_bar_bg.png
index 79010fa70..d2be6c4db 100644
Binary files a/cocoa/res/info_bar_bg.png and b/cocoa/res/info_bar_bg.png differ
diff --git a/cocoa/res/info_bar_bg@2x.png b/cocoa/res/info_bar_bg@2x.png
index 486646a8e..ff74c8037 100644
Binary files a/cocoa/res/info_bar_bg@2x.png and b/cocoa/res/info_bar_bg@2x.png differ
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 4daecdfbf..9f2129154 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -536,6 +536,7 @@
       </tr><tr>
 	<td>maboroshin</td>
 	<td>Gokul Krishnan</td>
+	<td>John Horigan</td>
     </tr>
     </table>
     <p>
@@ -563,6 +564,10 @@
 	Updated case conversion and character categories to Unicode 11.
 	</li>
 	<li>
+	On Cocoa, use dark info bar background when system is set to Dark Appearance.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2055/">Bug #2055</a>.
+	</li>
+	<li>
 	Fixed a crash on Cocoa in bidirectional mode where some patterns of invalid UTF-8
 	caused failures to create Unicode strings.
 	</li>
-- 
cgit v1.2.3