[Scummvm-git-logs] scummvm master -> e84e71ed34f359f616a1ddbbd2c9cd54e978022e

Mataniko mataniko at gmail.com
Tue Apr 2 19:56:20 CEST 2019


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:
e84e71ed34 BACKENDS: Add gray20 color to our XPM icon parser


Commit: e84e71ed34f359f616a1ddbbd2c9cd54e978022e
    https://github.com/scummvm/scummvm/commit/e84e71ed34f359f616a1ddbbd2c9cd54e978022e
Author: Matan Bareket (mataniko at gmail.com)
Date: 2019-04-02T13:56:12-04:00

Commit Message:
BACKENDS: Add gray20 color to our XPM icon parser

We don't change the icon that often but there's much more x11 colors than just black and gray20 that we may end up having in the XPM file

Changed paths:
    backends/platform/sdl/sdl-window.cpp


diff --git a/backends/platform/sdl/sdl-window.cpp b/backends/platform/sdl/sdl-window.cpp
index 39c5f86..dbfb765 100644
--- a/backends/platform/sdl/sdl-window.cpp
+++ b/backends/platform/sdl/sdl-window.cpp
@@ -78,6 +78,8 @@ void SdlWindow::setupIcon() {
 			col = 0x00000000;
 		else if (!strcmp(color, "black"))
 			col = 0xFF000000;
+		else if (!strcmp(color, "gray20"))
+			col = 0xFF333333;
 		else if (color[0] == '#') {
 			if (sscanf(color + 1, "%06x", &col) != 1) {
 				warning("Wrong format of color (%s)", color + 1);





More information about the Scummvm-git-logs mailing list