example/qml-Qt6/window/CrashWindow.qml

@@ -14,7 +14,6 @@ FluWindow {
     fixSize: true
     showMinimize: false
     showStayTop: false
-    stayTop:true
 
     property string crashFilePath
 

example/qml/window/CrashWindow.qml

@@ -14,7 +14,6 @@ FluWindow {
     fixSize: true
     showMinimize: false
     showStayTop: false
-    stayTop:true
 
     property string crashFilePath
 

src/FluFramelessHelper.cpp

@@ -112,18 +112,16 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
             return true;
         }
         *result = 0;
-        POINT nativeGlobalPos{GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
-        POINT nativeLocalPos = nativeGlobalPos;
-        ::ScreenToClient(hwnd, &nativeLocalPos);
-        RECT clientRect{0, 0, 0, 0};
-        ::GetClientRect(hwnd, &clientRect);
-        auto clientWidth = clientRect.right-clientRect.left;
-        auto clientHeight = clientRect.bottom-clientRect.top;
+        short x = LOWORD(msg->lParam);
+        short y = HIWORD(msg->lParam);
         int margins = _helper->getMargins();
-        bool left = nativeLocalPos.x < margins;
-        bool right = nativeLocalPos.x > clientWidth - margins;
-        bool top = nativeLocalPos.y < margins;
-        bool bottom = nativeLocalPos.y > clientHeight - margins;
+        QPointer<QQuickWindow> win = _helper->window;
+        qreal dp = _helper->window->devicePixelRatio();
+        QPoint pos =  win->mapFromGlobal(QPoint(x/dp, y/dp));
+        bool left = pos.x() < margins;
+        bool right = pos.x() > win->width() - margins;
+        bool top = pos.y() < margins;
+        bool bottom = pos.y() > win->height() - margins;
         *result = 0;
         if (_helper->resizeable() && !_helper->fullScreen() && !_helper->maximized()) {
             if (left && top) {
@@ -148,10 +146,18 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
             return true;
         }
         QVariant appBar = _helper->getAppBar();
-        if(!appBar.isNull()&& _helper->hoverAppBar()){
+        if(!appBar.isNull()){
+            auto item = appBar.value<QQuickItem*>();
+            if(item->contains(pos)){
+                QPoint appBarTopLeft = item->mapToItem(_helper->window->contentItem(),QPoint(0, 0)).toPoint();
+                QRect rcAppBar = QRect(appBarTopLeft, QSize(item->width(), item->height()));
+                if (rcAppBar.contains(pos) && _helper->hoverAppBar())
+                {
                     *result = HTCAPTION;
                     return true;
                 }
+            }
+        }
         *result = HTCLIENT;
         return true;
     }else if(uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN){
@@ -174,7 +180,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
         *result = DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1);
         return true;
     }else if(uMsg == WM_GETMINMAXINFO){
-#if QT_VERSION < QT_VERSION_CHECK(6,2,4)
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         MINMAXINFO* minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
         auto pixelRatio = _helper->window->devicePixelRatio();
         auto geometry = _helper->window->screen()->availableGeometry();

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

@@ -94,14 +94,6 @@ Rectangle{
         }
         property bool isRestore: win && Window.Maximized === win.visibility
         property bool resizable: win && !(win.height === win.maximumHeight && win.height === win.minimumHeight && win.width === win.maximumWidth && win.width === win.minimumWidth)
-        function containsPointToItem(point,item){
-            var pos = item.mapToGlobal(0,0)
-            var rect = Qt.rect(pos.x,pos.y,item.width,item.height)
-            if(point.x>rect.x && point.x<(rect.x+rect.width) && point.y>rect.y && point.y<(rect.y+rect.height)){
-                return true
-            }
-            return false
-        }
     }
     MouseArea{
         id:mouse_app_bar
@@ -291,29 +283,31 @@ Rectangle{
     }
     function _maximizeButtonHover(){
         var hover = false
+        var pos = btn_maximize.mapToGlobal(0,0)
         if(btn_maximize.visible){
-            if(d.containsPointToItem(FluTools.cursorPos(),btn_maximize)){
-                hover = true
+            var rect = Qt.rect(pos.x,pos.y,btn_maximize.width,btn_maximize.height)
+            pos = FluTools.cursorPos()
+            if(pos.x>rect.x && pos.x<(rect.x+rect.width) && pos.y>rect.y && pos.y<(rect.y+rect.height)){
+                hover = true;
             }
         }
         d.hoverMaxBtn = hover
         return hover;
     }
     function _appBarHover(){
-        var cursorPos = FluTools.cursorPos()
         for(var i =0 ;i< d.hitTestList.length; i++){
             var item = d.hitTestList[i]
+            var pos = item.mapToGlobal(0,0)
             if(item.visible){
-                if(d.containsPointToItem(cursorPos,item)){
+                var rect = Qt.rect(pos.x,pos.y,item.width,item.height)
+                pos = FluTools.cursorPos()
+                if(pos.x>rect.x && pos.x<(rect.x+rect.width) && pos.y>rect.y && pos.y<(rect.y+rect.height)){
                     return false
                 }
             }
         }
-        if(d.containsPointToItem(cursorPos,control)){
         return true
     }
-        return false
-    }
     function setHitTestVisible(id){
         d.hitTestList.push(id)
     }

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

@@ -66,7 +66,7 @@ Rectangle{
             return true
         return count!==0
     }
-    FluText{
+    Text{
         anchors.centerIn: parent
         color: Qt.rgba(1,1,1,1)
         visible: !isDot

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

@@ -94,14 +94,6 @@ Rectangle{
         }
         property bool isRestore: win && Window.Maximized === win.visibility
         property bool resizable: win && !(win.height === win.maximumHeight && win.height === win.minimumHeight && win.width === win.maximumWidth && win.width === win.minimumWidth)
-        function containsPointToItem(point,item){
-            var pos = item.mapToGlobal(0,0)
-            var rect = Qt.rect(pos.x,pos.y,item.width,item.height)
-            if(point.x>rect.x && point.x<(rect.x+rect.width) && point.y>rect.y && point.y<(rect.y+rect.height)){
-                return true
-            }
-            return false
-        }
     }
     MouseArea{
         id:mouse_app_bar
@@ -291,29 +283,31 @@ Rectangle{
     }
     function _maximizeButtonHover(){
         var hover = false
+        var pos = btn_maximize.mapToGlobal(0,0)
         if(btn_maximize.visible){
-            if(d.containsPointToItem(FluTools.cursorPos(),btn_maximize)){
-                hover = true
+            var rect = Qt.rect(pos.x,pos.y,btn_maximize.width,btn_maximize.height)
+            pos = FluTools.cursorPos()
+            if(pos.x>rect.x && pos.x<(rect.x+rect.width) && pos.y>rect.y && pos.y<(rect.y+rect.height)){
+                hover = true;
             }
         }
         d.hoverMaxBtn = hover
         return hover;
     }
     function _appBarHover(){
-        var cursorPos = FluTools.cursorPos()
         for(var i =0 ;i< d.hitTestList.length; i++){
             var item = d.hitTestList[i]
+            var pos = item.mapToGlobal(0,0)
             if(item.visible){
-                if(d.containsPointToItem(cursorPos,item)){
+                var rect = Qt.rect(pos.x,pos.y,item.width,item.height)
+                pos = FluTools.cursorPos()
+                if(pos.x>rect.x && pos.x<(rect.x+rect.width) && pos.y>rect.y && pos.y<(rect.y+rect.height)){
                     return false
                 }
             }
         }
-        if(d.containsPointToItem(cursorPos,control)){
         return true
     }
-        return false
-    }
     function setHitTestVisible(id){
         d.hitTestList.push(id)
     }

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

@@ -66,7 +66,7 @@ Rectangle{
             return true
         return count!==0
     }
-    FluText{
+    Text{
         anchors.centerIn: parent
         color: Qt.rgba(1,1,1,1)
         visible: !isDot