[Scummvm-git-logs] scummvm master -> 9b4458efe21ef8cb327875388e7cdd32a67371fd

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9b4458efe2 GRAPHICS: MACGUI: Use proper colors in editable text


Commit: 9b4458efe21ef8cb327875388e7cdd32a67371fd
    https://github.com/scummvm/scummvm/commit/9b4458efe21ef8cb327875388e7cdd32a67371fd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-02T13:04:41+02:00

Commit Message:
GRAPHICS: MACGUI: Use proper colors in editable text

Changed paths:
    graphics/macgui/maceditabletext.cpp


diff --git a/graphics/macgui/maceditabletext.cpp b/graphics/macgui/maceditabletext.cpp
index 58d3653ddf..b1d6c69da9 100644
--- a/graphics/macgui/maceditabletext.cpp
+++ b/graphics/macgui/maceditabletext.cpp
@@ -91,7 +91,7 @@ void MacEditableText::init() {
 	_cursorSurface->clear(_wm->_colorBlack);
 
 	_composeSurface = new ManagedSurface(_dims.width(), _dims.height());
-	_composeSurface->clear(_wm->_colorWhite);
+	_composeSurface->clear(_bgcolor);
 }
 
 MacEditableText::~MacEditableText() {
@@ -161,7 +161,7 @@ bool MacEditableText::draw(bool forceRedraw) {
 	if (!_contentIsDirty && !_cursorDirty && !forceRedraw)
 		return false;
 
-	_composeSurface->clear(_wm->_colorWhite);
+	_composeSurface->clear(_bgcolor);
 
 	_contentIsDirty = false;
 	_cursorDirty = false;
@@ -243,10 +243,10 @@ void MacEditableText::drawSelection() {
 		byte *ptr = (byte *)_composeSurface->getBasePtr(x1, y);
 
 		for (int x = x1; x < x2; x++, ptr++)
-			if (*ptr == _wm->_colorBlack)
-				*ptr = _wm->_colorWhite;
+			if (*ptr == _fgcolor)
+				*ptr = _bgcolor;
 			else
-				*ptr = _wm->_colorBlack;
+				*ptr = _fgcolor;
 	}
 }