From 40d73269371a9e2b142eb2be2bd2f70aff6346d2 Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: 周日, 25 2月 2024 04:13:02 +0800 Subject: [PATCH] Better workaround for win10 top border issue --- src/core/CMakeLists.txt | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e801dd2..3849ced 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -15,6 +15,8 @@ kernel/nativeeventfilter.cpp kernel/sharedeventfilter_p.h kernel/sharedeventfilter.cpp + kernel/winidchangeeventfilter_p.h + kernel/winidchangeeventfilter.cpp shared/systemwindow_p.h contexts/abstractwindowcontext_p.h contexts/abstractwindowcontext.cpp @@ -27,6 +29,7 @@ qwindowkit_windows.h qwindowkit_windows.cpp shared/qwkwindowsextra_p.h + shared/windows10borderhandler_p.h ) elseif(APPLE) else() @@ -65,6 +68,8 @@ endif() endif() +set(_sync_include_options) + if(QWINDOWKIT_ENABLE_STYLE_AGENT) list(APPEND _src style/styleagent.h @@ -79,21 +84,19 @@ else() list(APPEND _src style/styleagent_linux.cpp) endif() +else() + list(APPEND _sync_include_options EXCLUDE "style/\\.+") endif() qwk_add_library(${PROJECT_NAME} AUTOGEN SOURCES ${_src} - LINKS + FEATURES cxx_std_17 LINKS_PRIVATE ${_links_private} QT_LINKS Core Gui QT_INCLUDE_PRIVATE Core Gui INCLUDE_PRIVATE kernel contexts shared PREFIX QWK_CORE -) - -set_target_properties(${PROJECT_NAME} PROPERTIES - CXX_STANDARD 17 - CXX_STANDARD_REQUIRED TRUE + SYNC_INCLUDE_OPTIONS ${_sync_include_options} ) set(QWINDOWKIT_ENABLED_TARGETS ${QWINDOWKIT_ENABLED_TARGETS} ${PROJECT_NAME} PARENT_SCOPE) -- Gitblit v1.9.1