src/FluFramelessHelper.cpp

@@ -1,13 +1,11 @@
 #include "FluFramelessHelper.h"
 
 #include <QGuiApplication>
-#include <QScreen>
 #include "FluTools.h"
 #ifdef Q_OS_WIN
 #pragma comment (lib,"user32.lib")
 #pragma comment (lib,"dwmapi.lib")
 #include <windows.h>
-#include <windowsx.h>
 #include <dwmapi.h>
 
 static inline QByteArray qtNativeEventType()
@@ -89,7 +87,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
     }
     const auto msg = static_cast<const MSG *>(message);
     const HWND hwnd = msg->hwnd;
-    if (!hwnd || !msg) {
+    if (!hwnd) {
         return false;
     }
     const qint64 wid = reinterpret_cast<qint64>(hwnd);
@@ -97,6 +95,10 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
         return false;
     }
     const UINT uMsg = msg->message;
+    if (!msg || !hwnd)
+    {
+        return false;
+    }
     const WPARAM wParam = msg->wParam;
     const LPARAM lParam = msg->lParam;
     if(uMsg == WM_WINDOWPOSCHANGING){
@@ -111,29 +113,23 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
     }else if(uMsg == WM_NCCALCSIZE){
         const auto clientRect = ((wParam == FALSE) ? reinterpret_cast<LPRECT>(lParam) : &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]);
         const LONG originalTop = clientRect->top;
+        const LONG originalBottom = clientRect->bottom;
         const LONG originalLeft = clientRect->left;
+        const LONG originalRight= clientRect->right;
         const LRESULT hitTestResult = ::DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam);
         if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
             *result = hitTestResult;
             return true;
         }
-        int offsetTop = 0;
-        bool isMax = IsZoomed(hwnd);
-        if(isMax){
+        if(IsZoomed(hwnd)){
             _helper->setOriginalPos(QPoint(originalLeft,originalTop));
             if(isTaskbarAutoHide()){
                 clientRect->bottom -= 1;
             }
-            offsetTop = 0;
         }else{
             _helper->setOriginalPos({});
-            if(FluTools::getInstance()->isWindows11OrGreater()){
-                offsetTop = 0;
-            }else{
-                offsetTop = 1;
-            }
         }
-        clientRect->top = originalTop+offsetTop;
+        clientRect->top = originalTop + 1;
         *result = WVR_REDRAW;
         return true;
     }if(uMsg == WM_NCHITTEST){
@@ -160,15 +156,10 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
     }else if(uMsg == WM_NCPAINT){
         *result = 0;
         return true;
-    }else if(uMsg == WM_NCACTIVATE){
+    }
+    else if(uMsg == WM_NCACTIVATE){
         *result = DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1);
         return true;
-    }else if(uMsg == WM_SYSCOMMAND){
-        const WPARAM filteredWParam = (wParam & 0xFFF0);
-        if (filteredWParam == SC_MAXIMIZE) {
-            _helper->window->showMaximized();
-            return true;
-        }
     }
     return false;
 #endif
@@ -287,7 +278,7 @@ void FluFramelessHelper::componentComplete(){
         _appBarHeight = QQmlProperty(window,"_appBarHeight");
 #ifdef Q_OS_WIN
         if(isCompositionEnabled()){
-            window->setFlag(Qt::CustomizeWindowHint,true);
+            window->setFlags(Qt::Window|Qt::CustomizeWindowHint);
             _nativeEvent =new FramelessEventFilter(this);
             qApp->installNativeEventFilter(_nativeEvent);
             HWND hwnd = reinterpret_cast<HWND>(window->winId());
@@ -307,7 +298,7 @@ void FluFramelessHelper::componentComplete(){
 #endif
         int w = _realWidth.read().toInt();
         int h = _realHeight.read().toInt()+_appBarHeight.read().toInt();
-        if(!resizeable()){
+        if(_fixSize.read().toBool()){
             window->setMaximumSize(QSize(w,h));
             window->setMinimumSize(QSize(w,h));
         }
@@ -317,7 +308,6 @@ void FluFramelessHelper::componentComplete(){
         _stayTop.connectNotifySignal(this,SLOT(_onStayTopChange()));
         _screen.connectNotifySignal(this,SLOT(_onScreenChanged()));
         window->installEventFilter(this);
-        Q_EMIT loadCompleted();
     }
 }
 
@@ -334,7 +324,7 @@ void FluFramelessHelper::showSystemMenu(){
     QPoint point = QCursor::pos();
     HWND hwnd = reinterpret_cast<HWND>(window->winId());
     DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
-    SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_SYSMENU);
+    SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MAXIMIZEBOX);
     const HMENU hMenu = ::GetSystemMenu(hwnd, FALSE);
     DeleteMenu(hMenu, SC_MOVE, MF_BYCOMMAND);
     DeleteMenu(hMenu, SC_SIZE, MF_BYCOMMAND);
@@ -352,7 +342,7 @@ void FluFramelessHelper::showSystemMenu(){
     if (result != FALSE) {
         PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
     }
-    SetWindowLongPtr(hwnd, GWL_STYLE, style &~ WS_SYSMENU);
+    SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION &~ WS_SYSMENU);
 #endif
 }
 
@@ -414,7 +404,7 @@ void FluFramelessHelper::setOriginalPos(QVariant pos){
 }
 
 bool FluFramelessHelper::resizeable(){
-    return !_fixSize.read().toBool();
+    return !(window->width() == window->maximumWidth() && window->width() == window->minimumWidth() && window->height() == window->maximumHeight() && window->height() == window->minimumHeight());
 }
 
 bool FluFramelessHelper::_maximized(){

src/FluFramelessHelper.h

@@ -41,7 +41,6 @@ public:
     QObject* maximizeButton();
     void setOriginalPos(QVariant pos);
     Q_INVOKABLE void showSystemMenu();
-    Q_SIGNAL void loadCompleted();
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
 private:

src/FluTools.cpp

@@ -240,7 +240,3 @@ bool FluTools::isWindows10OrGreater(){
         return var.toBool();
     }
 }
-
-int FluTools::getTaskBarHeight(QQuickWindow* window){
-    return window->screen()->geometry().height() - window->screen()->availableGeometry().height();
-}

src/FluTools.h

@@ -5,7 +5,6 @@
 #include <QFile>
 #include <QColor>
 #include <QtQml/qqml.h>
-#include <QQuickWindow>
 #include "singleton.h"
 
 /**
@@ -55,7 +54,6 @@ public:
     Q_INVOKABLE int windowBuildNumber();
     Q_INVOKABLE bool isWindows11OrGreater();
     Q_INVOKABLE bool isWindows10OrGreater();
-    Q_INVOKABLE int getTaskBarHeight(QQuickWindow* window);
 };
 
 #endif // FLUTOOLS_H

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

@@ -8,7 +8,7 @@ Button {
     property string contentDescription: ""
     QtObject{
         id:d
-        property bool checked: (rect_back.height === background.height) && (progress === 1)
+        property bool checked: rect_back.height == background.height
     }
     property color normalColor: {
         if(d.checked){

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

@@ -70,13 +70,12 @@ Window {
         _realHeight = height
         _realWidth = width
         moveWindowToDesktopCenter()
-        fixWindowSize()
-        lifecycle.onCompleted(window)
-        initArgument(argument)
         useSystemAppBar = FluApp.useSystemAppBar
         if(!useSystemAppBar){
-            loader_frameless_helper.sourceComponent = com_frameless_helper
+            loader_frameless_helper.sourceComponent = com_frameless
         }
+        lifecycle.onCompleted(window)
+        initArgument(argument)
         if(window.autoMaximize){
             window.showMaximized()
         }else{
@@ -120,12 +119,8 @@ Window {
         function onClosing(event){closeListener(event)}
     }
     Component{
-        id:com_frameless_helper
-        FluFramelessHelper{
-            onLoadCompleted:{
-                window.moveWindowToDesktopCenter()
-            }
-        }
+        id:com_frameless
+        FluFramelessHelper{}
     }
     Component{
         id:com_background
@@ -305,15 +300,12 @@ Window {
     }
     function moveWindowToDesktopCenter(){
         screen = Qt.application.screens[FluTools.cursorScreenIndex()]
-        var taskBarHeight = FluTools.getTaskBarHeight(window)
-        window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height-taskBarHeight)/2+Screen.virtualY,window.width,window.height)
-    }
-    function fixWindowSize(){
+        window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height)/2+Screen.virtualY,window.width,window.height)
         if(fixSize){
-            window.maximumWidth =  window.width
-            window.maximumHeight =  window.height
-            window.minimumWidth = window.width
-            window.minimumHeight = window.height
+            maximumWidth =  width
+            maximumHeight =  height
+            minimumWidth = width
+            minimumHeight = height
         }
     }
     function onResult(data){

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

@@ -9,7 +9,7 @@ Button {
     property string contentDescription: ""
     QtObject{
         id:d
-        property bool checked: (rect_back.height === background.height) && (progress === 1)
+        property bool checked: rect_back.height == background.height
     }
     property color normalColor: {
         if(d.checked){

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

@@ -69,13 +69,12 @@ Window {
         _realHeight = height
         _realWidth = width
         moveWindowToDesktopCenter()
-        fixWindowSize()
-        lifecycle.onCompleted(window)
-        initArgument(argument)
         useSystemAppBar = FluApp.useSystemAppBar
         if(!useSystemAppBar){
-            loader_frameless_helper.sourceComponent = com_frameless_helper
+            loader_frameless_helper.sourceComponent = com_frameless
         }
+        lifecycle.onCompleted(window)
+        initArgument(argument)
         if(window.autoMaximize){
             window.showMaximized()
         }else{
@@ -119,12 +118,8 @@ Window {
         function onClosing(event){closeListener(event)}
     }
     Component{
-        id:com_frameless_helper
-        FluFramelessHelper{
-            onLoadCompleted:{
-                window.moveWindowToDesktopCenter()
-            }
-        }
+        id:com_frameless
+        FluFramelessHelper{}
     }
     Component{
         id:com_background
@@ -304,15 +299,12 @@ Window {
     }
     function moveWindowToDesktopCenter(){
         screen = Qt.application.screens[FluTools.cursorScreenIndex()]
-        var taskBarHeight = FluTools.getTaskBarHeight(window)
-        window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height-taskBarHeight)/2+Screen.virtualY,window.width,window.height)
-    }
-    function fixWindowSize(){
+        window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height)/2+Screen.virtualY,window.width,window.height)
         if(fixSize){
-            window.maximumWidth =  window.width
-            window.maximumHeight =  window.height
-            window.minimumWidth = window.width
-            window.minimumHeight = window.height
+            maximumWidth =  width
+            maximumHeight =  height
+            minimumWidth = width
+            minimumHeight = height
         }
     }
     function onResult(data){