diff --git a/.cmake/InstallerScript.iss.in b/.cmake/InstallerScript.iss.in index c20d107d..524d74cb 100644 --- a/.cmake/InstallerScript.iss.in +++ b/.cmake/InstallerScript.iss.in @@ -30,6 +30,7 @@ SolidCompression=yes WizardStyle=modern UninstallDisplayIcon={app}\{#MyAppExeName} SetupIconFile=.\..\favicon.ico +MinVersion = 6.0 [Languages] Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl" diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 3b30ba4b..8849b48b 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -6,7 +6,6 @@ project(example VERSION 1.0) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) - #导入exmaple的QML位置,不然import example有时候会爆红 set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8da3d6a..b8f6b39a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -10,7 +10,6 @@ endif() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) - if (FLUENTUI_BUILD_STATIC_LIB) add_definitions(-DFLUENTUI_BUILD_STATIC_LIB) endif() diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp index 0e1f0acb..dbebb2cc 100644 --- a/src/FluFrameless.cpp +++ b/src/FluFrameless.cpp @@ -73,16 +73,11 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void * } return false; }else if(uMsg == WM_NCACTIVATE){ - if(isCompositionEnabled()){ - *result = DefWindowProc(hwnd, uMsg, wParam, -1); - }else{ - if (wParam == FALSE) { - *result = TRUE; - } else { - *result = FALSE; - } + if(!isCompositionEnabled()){ + *result = 1; + return true; } - return true; + return false; } return false; #endif