amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 13:27:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-12-18 23:56:28 +08:00
parent 6d2a8cde7a
commit af6e39d8c0
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cmake/InstallerScript.iss.in
View File

@ -30,6 +30,7 @@ SolidCompression=yes
WizardStyle=modern WizardStyle=modern
UninstallDisplayIcon={app}\{#MyAppExeName} UninstallDisplayIcon={app}\{#MyAppExeName}
SetupIconFile=.\..\favicon.ico SetupIconFile=.\..\favicon.ico
MinVersion = 6.0
[Languages] [Languages]
Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl" Name: "chinesesimplified"; MessagesFile: "compiler:Languages\ChineseSimplified.isl"

1
example/CMakeLists.txt
View File

@ -6,7 +6,6 @@ project(example VERSION 1.0)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
#导入exmaple的QML位置，不然import example有时候会爆红 #导入exmaple的QML位置，不然import example有时候会爆红
set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE) set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE)

1
src/CMakeLists.txt
View File

@ -10,7 +10,6 @@ endif()
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (FLUENTUI_BUILD_STATIC_LIB) if (FLUENTUI_BUILD_STATIC_LIB)
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB) add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
endif() endif()

13
src/FluFrameless.cpp
View File

@ -73,16 +73,11 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
} }
return false; return false;
}else if(uMsg == WM_NCACTIVATE){ }else if(uMsg == WM_NCACTIVATE){
if(isCompositionEnabled()){ if(!isCompositionEnabled()){
*result = DefWindowProc(hwnd, uMsg, wParam, -1); *result = 1;
}else{ return true;
if (wParam == FALSE) {
*result = TRUE;
} else {
*result = FALSE;
}
} }
return true; return false;
} }
return false; return false;
#endif #endif