diff options
| author | Phil Nash | 2015-07-06 06:13:56 +0100 |
|---|---|---|
| committer | Phil Nash | 2015-07-06 06:13:56 +0100 |
| commit | 18acff62d3ae55bb02a4d0c20aabc3f75223977c (patch) | |
| tree | 3f934b90c5c49136b94ebb1c5f1eb8149cdf74bf /include | |
| parent | c1ca0fdabe8def3e67d42b275d51ac383fd5819f (diff) | |
| parent | 6160a2b0796c73e64916f2602c9b6410c8b00bb6 (diff) | |
| download | catch3-18acff62d3ae55bb02a4d0c20aabc3f75223977c.tar.gz | |
Merge branch 'develop' of git://github.com/RandomInEqualities/Catch into RandomInEqualities-develop
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_console_colour_impl.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/internal/catch_console_colour_impl.hpp b/include/internal/catch_console_colour_impl.hpp index 2c4b36c3..9ca915ff 100644 --- a/include/internal/catch_console_colour_impl.hpp +++ b/include/internal/catch_console_colour_impl.hpp @@ -60,12 +60,13 @@ namespace { { CONSOLE_SCREEN_BUFFER_INFO csbiInfo; GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo ); - originalAttributes = csbiInfo.wAttributes; + originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY ); + originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY ); } virtual void use( Colour::Code _colourCode ) { switch( _colourCode ) { - case Colour::None: return setTextAttribute( originalAttributes ); + case Colour::None: return setTextAttribute( originalForegroundAttributes ); case Colour::White: return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE ); case Colour::Red: return setTextAttribute( FOREGROUND_RED ); case Colour::Green: return setTextAttribute( FOREGROUND_GREEN ); @@ -85,10 +86,11 @@ namespace { private: void setTextAttribute( WORD _textAttribute ) { - SetConsoleTextAttribute( stdoutHandle, _textAttribute ); + SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes ); } HANDLE stdoutHandle; - WORD originalAttributes; + WORD originalForegroundAttributes; + WORD originalBackgroundAttributes; }; IColourImpl* platformColourInstance() { |