Mentalflow
/
framelesshelper
forked from github_mirror/framelesshelper
1
0
Fork 0
Code Pull Requests Activity

win: minor tweaks 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-12-14 16:17:07 +08:00
parent 45225d11d8
commit 493663a787
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/cmakehelper.cmake
View File

@ -39,7 +39,7 @@ function(setup_compile_params arg_target)
QT_DISABLE_DEPRECATED_BEFORE=0x070000 QT_DISABLE_DEPRECATED_BEFORE=0x070000
QT_DISABLE_DEPRECATED_UP_TO=0x070000 # Since 6.5 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 target_compile_definitions(${arg_target} PRIVATE
QT_NO_KEYWORDS # Some QtQuick private headers still use the traditional Qt keywords. 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) target_compile_options(${arg_target} PRIVATE /Zc:enumTypes /Zc:gotoScope /Zc:nrvo)
endif() endif()
if(MSVC_VERSION GREATER_EQUAL 1935) # Visual Studio 2022 version 17.5 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() endif()
else() else()
target_compile_options(${arg_target} PRIVATE target_compile_options(${arg_target} PRIVATE

BIN
src/core/resources/fonts/iconfont.ttf
View File

Binary file not shown.

8
src/core/utils.cpp
View File

@ -68,10 +68,10 @@ static const QHash<int, FONT_ICON> g_fontIconsTable = {
{static_cast<int>(SystemButtonType::Unknown), {0x0000, 0x0000}}, {static_cast<int>(SystemButtonType::Unknown), {0x0000, 0x0000}},
{static_cast<int>(SystemButtonType::WindowIcon), {0xE756, 0x0000}}, {static_cast<int>(SystemButtonType::WindowIcon), {0xE756, 0x0000}},
{static_cast<int>(SystemButtonType::Help), {0xE897, 0x0000}}, {static_cast<int>(SystemButtonType::Help), {0xE897, 0x0000}},
{static_cast<int>(SystemButtonType::Minimize), {0xE921, 0xE64C}}, {static_cast<int>(SystemButtonType::Minimize), {0xE921, 0xE93E}},
{static_cast<int>(SystemButtonType::Maximize), {0xE922, 0xE64D}}, {static_cast<int>(SystemButtonType::Maximize), {0xE922, 0xE93C}},
{static_cast<int>(SystemButtonType::Restore), {0xE923, 0xE64E}}, {static_cast<int>(SystemButtonType::Restore), {0xE923, 0xE93D}},
{static_cast<int>(SystemButtonType::Close), {0xE8BB, 0xE64F}} {static_cast<int>(SystemButtonType::Close), {0xE8BB, 0xE93B}}
}; };
#endif // FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE #endif // FRAMELESSHELPER_CORE_NO_BUNDLE_RESOURCE