From 649aa295523885723ea4c9d56148ebe2b9b8a239 Mon Sep 17 00:00:00 2001 From: Zulkarnine Mahmud Date: Tue, 20 Jun 2017 15:40:53 +0900 Subject: [PATCH] Fix background color in ColoredPrintf Re-use existing background color for Widows' console window. This fixes a problem where the background color for ColoredPrintf would be BLACK even if the user's console is using a different BG color. --- googletest/src/gtest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 3a18f25d..1e6afb28 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2979,13 +2979,15 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) { CONSOLE_SCREEN_BUFFER_INFO buffer_info; GetConsoleScreenBufferInfo(stdout_handle, &buffer_info); const WORD old_color_attrs = buffer_info.wAttributes; - + // Let's reuse the BG + const WORD existing_bg = old_color_attrs & 0x00F0; + // We need to flush the stream buffers into the console before each // SetConsoleTextAttribute call lest it affect the text that is already // printed but has not yet reached the console. fflush(stdout); SetConsoleTextAttribute(stdout_handle, - GetColorAttribute(color) | FOREGROUND_INTENSITY); + GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY); vprintf(fmt, args); fflush(stdout);