From 3a8879608ade52cb862964cb1354d38298973bb5 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Thu, 17 Mar 2022 22:31:18 +0100
Subject: [PATCH] Native window decorations: fixed wrong window title character
 encoding used in Windows taskbar (issue #502)

---
 CHANGELOG.md                                             | 8 ++++++++
 flatlaf-natives/flatlaf-natives-windows/build.gradle.kts | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f42b8e1b..9b229d2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 FlatLaf Change Log
 ==================
 
+## 2.2-SNAPSHOT
+
+#### Fixed bugs
+
+- Native window decorations (Windows 10/11 only): Fixed wrong window title
+  character encoding used in Windows taskbar. (issue #502)
+
+
 ## 2.1
 
 #### New features and improvements
diff --git a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts
index ba831e20..442f5c7c 100644
--- a/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts
+++ b/flatlaf-natives/flatlaf-natives-windows/build.gradle.kts
@@ -54,8 +54,8 @@ library {
 
 				compilerArgs.addAll( toolChain.map {
 					when( it ) {
-						is Gcc, is Clang -> listOf( "-O2" )
-						is VisualCpp -> listOf( "/O2", "/Zl", "/GS-" )
+						is Gcc, is Clang -> listOf( "-O2", "-DUNICODE" )
+						is VisualCpp -> listOf( "/O2", "/Zl", "/GS-", "/DUNICODE" )
 						else -> emptyList()
 					}
 				} )