update

.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"

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)
 

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()

src/FluFrameless.cpp

@@ -73,16 +73,11 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
         }
         return false;
     }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;
 #endif
@@ -197,6 +192,8 @@ void FluFrameless::componentComplete(){
         DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
         SetWindowLongPtr(hwnd,GWL_STYLE,style &~ WS_SYSMENU);
         SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE |SWP_FRAMECHANGED);
+        _stayTop = QQmlProperty(_window,"stayTop");
+        _stayTop.connectNotifySignal(this,SLOT(_stayTopChange()));
 #else
         _window->setFlag(Qt::FramelessWindowHint,true);
 #endif
@@ -204,6 +201,14 @@ void FluFrameless::componentComplete(){
     }
 }
 
+void FluFrameless::_stayTopChange(){
+#ifdef Q_OS_WIN
+    HWND hwnd = reinterpret_cast<HWND>(_window->winId());
+    DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
+    SetWindowLongPtr(hwnd,GWL_STYLE,style &~ WS_SYSMENU);
+#endif
+}
+
 FluFrameless::~FluFrameless(){
     if (!_window.isNull()) {
         _window->removeEventFilter(this);

src/FluFrameless.h

@@ -5,6 +5,7 @@
 #include <QQuickWindow>
 #include <QtQml/qqml.h>
 #include <QAbstractNativeEventFilter>
+#include <QQmlProperty>
 #include "stdafx.h"
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -28,7 +29,6 @@ public:
 class FluFrameless : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_PROPERTY_AUTO(bool,stayTop)
     QML_NAMED_ELEMENT(FluFrameless)
 public:
     explicit FluFrameless(QObject *parent = nullptr);
@@ -39,9 +39,11 @@ protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
 private:
     void updateCursor(int edges);
+    Q_SLOT void _stayTopChange();
 private:
     QPointer<QQuickWindow> _window = nullptr;
     FramelessEventFilter* _nativeEvent = nullptr;
+    QQmlProperty _stayTop;
 };
 
 #endif // FLUFRAMELESS_H

src/Qt5/imports/FluentUI/Controls/FluWindow.qml

@@ -112,9 +112,7 @@ Window {
     }
     Component{
         id:com_frameless
-        FluFrameless{
+        FluFrameless{}
-            stayTop: window.stayTop
-        }
     }
     Component{
         id:com_background

src/Qt6/imports/FluentUI/Controls/FluWindow.qml

@@ -111,9 +111,7 @@ Window {
     }
     Component{
         id:com_frameless
-        FluFrameless{
+        FluFrameless{}
-            stayTop: window.stayTop
-        }
     }
     Component{
         id:com_background