From 493663a7874c6f4624be0ce64fc5720542bc9ca2 Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Wed, 14 Dec 2022 16:17:07 +0800
Subject: [PATCH] win: minor tweaks

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 src/core/cmakehelper.cmake            |   4 ++--
 src/core/resources/fonts/iconfont.ttf | Bin 1984 -> 1860 bytes
 src/core/utils.cpp                    |   8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/cmakehelper.cmake b/src/core/cmakehelper.cmake
index 61a1691..d3cef71 100644
--- a/src/core/cmakehelper.cmake
+++ b/src/core/cmakehelper.cmake
@@ -39,7 +39,7 @@ function(setup_compile_params arg_target)
         QT_DISABLE_DEPRECATED_BEFORE=0x070000
         QT_DISABLE_DEPRECATED_UP_TO=0x070000 # Since 6.5
     )
-    if(NOT DEFINED __DONT_DISABLE_QT_KEYWORDS OR NOT __DONT_DISABLE_QT_KEYWORDS)
+    if(NOT (DEFINED __DONT_DISABLE_QT_KEYWORDS AND __DONT_DISABLE_QT_KEYWORDS))
         target_compile_definitions(${arg_target} PRIVATE
             QT_NO_KEYWORDS # Some QtQuick private headers still use the traditional Qt keywords.
         )
@@ -152,7 +152,7 @@ function(setup_compile_params arg_target)
             target_compile_options(${arg_target} PRIVATE /Zc:enumTypes /Zc:gotoScope /Zc:nrvo)
         endif()
         if(MSVC_VERSION GREATER_EQUAL 1935) # Visual Studio 2022 version 17.5
-            target_compile_options(${arg_target} PRIVATE /Zc:templateScope)
+            target_compile_options(${arg_target} PRIVATE /Zc:templateScope /Zc:checkGwOdr)
         endif()
     else()
         target_compile_options(${arg_target} PRIVATE
diff --git a/src/core/resources/fonts/iconfont.ttf b/src/core/resources/fonts/iconfont.ttf
index 5855799408b50fb1d58b903607c7efbeb9d4725c..26a3b013753a0a94e571b64c6a1a128facb5355d 100644
GIT binary patch
delta 539
zcmYjOJxC*A5Pjdbs|jcl*ANs=j_jon%-P(U%R%A>tOc)dxAlTqHJU#X!Jj5qTzQ2d
zaDt?>Id%_DNGoVzVIgRvSO^wY3#POYk~o`<XfgB6do%Oq!FL)s^Y4XcQs3wO0Q(K#
z$8tVhQhv3b0Zxz|tmbxB?(XylK=@0<`I?c=d}{n})fT4{W&9z!LG*Awy<K9X_(&_`
zgu{h&-WWMd9sy#Bq*hDC%BJ^2a}OB2rT#|k`17}mh3e%}Ao+wLktpE)<g4%fD}vt;
z_V%1O4Ms75(R!Hu6YYep*00#Q*H*h-z)m#h_!O(!38!{v?IhI{&b~eC1_XLlH{hNH
zCh!G1GCh3=QEnkX$HqdDNlzpepNuJEaV5mnR_gIF)#_#T^R*)E`V(|=TNU5|g0dtB
zC0Vk#+151<e%;nNIvTUc3>l#0413^%MAJ%4mLegUNs1(gJkFlUVRlGX>sS`kc$5H9
zT`*0vC_4&$vpTzR6qy{81+A?QaFa#NW>?(j>Q=UpDQ-<K=ZY00&<FHQ*?e}_@b_`q
PsB9L?Z|!WM*CzQFVa<ym

delta 664
zcmZutKWq|V6o2nN${#CKT0jkY#~l%pJ9Gd_o5*5gYm8S|9NNZ2PiX;_KZ&Af2OMmI
zNe5drCTdKqrgb33qz>9RICOGyaCd2LF^-Kxf%DxlbkN~_@BMz?@BO~_zHQIfp~s<Q
zT01WQ;4%PQxmMDuN00v+1mFnb^Zd<w3(JdpX93td!ZU?=EhjZ!yH_rrJl%vHqF<8k
zU`eZ2aTpRLIYKy8)=Kk--lRVO3=rh<)yl2gQ!jpK0FD9?Gb>+W<MO9t4=)d;cVW;*
z6u{4q@0<JCSh4|IB<!>%F)xr}0HUoBwr#qqXItO#x>L^@27s<^PH-|dbk(f;T78;o
z3bS9&^aB{>Y(Jp?EWj{~!yRZ_{=jx|4IBU?VmuHQrQ|90R>E-SQW)1JCoM1I3H!}T
z<m9K3yrTDnDB1m9UmzjI8>vxmG7?U(SDkHkrnAK>3eV2*vMeCuiArZ=zVq2)rv%v?
z##mx|v?hZQi2P$`xs8#%!=D%xy<vYMZc*G$x6HM=H-uPB;GWXirdmOjYpkjnKBjOv
zx?fde!oK92B1~WCmWiVVg+9gH)_BDJu)7chaA7JLksL0JNOs?07utP+_?Qa=@l-O(
zP2h$*81?k#dUKv=(2X0tSrg+ru3Pv)Klf%a@LwTpR&38W`F^cfFKU%SO{*6V5Xfm(
U=_u5S3$=RDnXhT(t0V#V3n_!2{{R30

diff --git a/src/core/utils.cpp b/src/core/utils.cpp
index bb20802..2bf844e 100644
--- a/src/core/utils.cpp
+++ b/src/core/utils.cpp
@@ -68,10 +68,10 @@ static const QHash<int, FONT_ICON> g_fontIconsTable = {
     {static_cast<int>(SystemButtonType::Unknown), {0x0000, 0x0000}},
     {static_cast<int>(SystemButtonType::WindowIcon), {0xE756, 0x0000}},
     {static_cast<int>(SystemButtonType::Help), {0xE897, 0x0000}},
-    {static_cast<int>(SystemButtonType::Minimize), {0xE921, 0xE64C}},
-    {static_cast<int>(SystemButtonType::Maximize), {0xE922, 0xE64D}},
-    {static_cast<int>(SystemButtonType::Restore), {0xE923, 0xE64E}},
-    {static_cast<int>(SystemButtonType::Close), {0xE8BB, 0xE64F}}
+    {static_cast<int>(SystemButtonType::Minimize), {0xE921, 0xE93E}},
+    {static_cast<int>(SystemButtonType::Maximize), {0xE922, 0xE93C}},
+    {static_cast<int>(SystemButtonType::Restore), {0xE923, 0xE93D}},
+    {static_cast<int>(SystemButtonType::Close), {0xE8BB, 0xE93B}}
 };
 #endif // FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE