From 3953b71d95ddfd8fcf23e24df3152b135cf59441 Mon Sep 17 00:00:00 2001
From: "msftbot[bot]" <48340428+msftbot[bot]@users.noreply.github.com>
Date: Thu, 5 Mar 2020 21:28:55 +0000
Subject: [PATCH] Apply dark window borders to NonClientIslandWindow using
ThemeHelpers (#4817)
This solution was vetted by the DWM team.
Fixes #3425.
---
src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp | 4 ++++
src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj | 4 +++-
src/cascadia/WindowsTerminal/packages.config | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
index fc85e78f977..b4752bd7327 100644
--- a/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
+++ b/src/cascadia/WindowsTerminal/NonClientIslandWindow.cpp
@@ -7,6 +7,7 @@
#include "NonClientIslandWindow.h"
#include "../types/inc/ThemeUtils.h"
#include "../types/inc/utils.hpp"
+#include "TerminalThemeHelpers.h"
extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -485,6 +486,9 @@ void NonClientIslandWindow::_UpdateFrameMargins() const noexcept
return _OnNcHitTest({ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) });
case WM_PAINT:
return _OnPaint();
+ case WM_ACTIVATE:
+ // If we do this every time we're activated, it should be close enough to correct.
+ TerminalTrySetDarkTheme(_window.get());
}
return IslandWindow::MessageHandler(message, wParam, lParam);
diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
index 1daa9a3a46d..c25ecefa2fb 100644
--- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
+++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
@@ -112,6 +112,7 @@
+