src/FluFramelessHelper.cpp

@@ -314,9 +314,6 @@ void FluFramelessHelper::componentComplete(){
             _appBar.value<QObject*>()->setProperty("systemMoveEnable",false);
         }
         window->setFlags((window->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint);
-        if(resizeable()){
-            window->setFlag(Qt::WindowMaximizeButtonHint);
-        }
         _nativeEvent =new FramelessEventFilter(this);
         qApp->installNativeEventFilter(_nativeEvent);
         HWND hwnd = reinterpret_cast<HWND>(window->winId());
@@ -346,7 +343,9 @@ void FluFramelessHelper::componentComplete(){
 #endif
         int w = _realWidth.read().toInt();
         int h = _realHeight.read().toInt()+_appBarHeight.read().toInt();
-        if(!resizeable()){
+        if(resizeable()){
+            window->setFlag(Qt::WindowMaximizeButtonHint);
+        }else{
             window->setMaximumSize(QSize(w,h));
             window->setMinimumSize(QSize(w,h));
         }

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

@@ -43,7 +43,7 @@ Window {
     property bool useSystemAppBar
     property color resizeBorderColor: {
         if(window.active){
-            return FluTheme.dark ? "#333333" : "#6E6E6E"
+            return _accentColor
         }
         return FluTheme.dark ? "#3D3D3E" : "#A7A7A7"
     }
@@ -61,6 +61,7 @@ Window {
     signal firstVisible()
     property point _offsetXY : Qt.point(0,0)
     property var _originalPos
+    property color _accentColor : FluTheme.dark ? "#333333" : "#6E6E6E"
     property int _realHeight
     property int _realWidth
     property int _appBarHeight: appBar.height
@@ -203,22 +204,18 @@ Window {
             }
         }
     }
-    Component{
-        id:com_border
-        Rectangle{
-            color:"transparent"
-            border.width: window.resizeBorderWidth
-            border.color: window.resizeBorderColor
-        }
-    }
     FluLoader{
         id:loader_frameless_helper
     }
     Item{
         id:layout_container
+        property bool isMaximum : window.visibility == Window.Maximized
         anchors{
             fill:parent
             topMargin: _offsetXY.y
+            bottomMargin: isMaximum ? 0 : _offsetXY.y
+            leftMargin:  isMaximum ? 0 :_offsetXY.x
+            rightMargin: isMaximum ? 0 : _offsetXY.x
         }
         onWidthChanged: {
             window.appBar.width = width
@@ -265,22 +262,27 @@ Window {
         FluWindowLifecycle{
             id:lifecycle
         }
-//        FluLoader{
+        Rectangle{
-//            id:loader_border
+            anchors.fill: parent
-//            anchors.fill: parent
+            color:"transparent"
-//            sourceComponent: {
+            border.width: window.resizeBorderWidth
-//                if(window.useSystemAppBar){
+            border.color: window.resizeBorderColor
-//                    return undefined
+            visible: {
-//                }
+                if(window.useSystemAppBar || FluTools.isWindows10OrGreater()){
-//                if(FluTools.isWindows10OrGreater()){
+                    return false
-//                    return undefined
+                }
-//                }
+                if(FluTools.isMacos()){
-//                if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
+                    if(window.visibility == Window.FullScreen){
-//                    return undefined
+                        return false
-//                }
+                    }
-//                return com_border
+                }else{
-//            }
+                    if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
-//        }
+                        return false
+                    }
+                }
+                return true
+            }
+        }
     }
     function destoryOnClose(){
         lifecycle.onDestoryOnClose()

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

@@ -42,7 +42,7 @@ Window {
     property bool useSystemAppBar
     property color resizeBorderColor: {
         if(window.active){
-            return FluTheme.dark ? "#333333" : "#6E6E6E"
+            return _accentColor
         }
         return FluTheme.dark ? "#3D3D3E" : "#A7A7A7"
     }
@@ -60,6 +60,7 @@ Window {
     signal firstVisible()
     property point _offsetXY : Qt.point(0,0)
     property var _originalPos
+    property color _accentColor : FluTheme.dark ? "#333333" : "#6E6E6E"
     property int _realHeight
     property int _realWidth
     property int _appBarHeight: appBar.height
@@ -202,14 +203,6 @@ Window {
             }
         }
     }
-    Component{
-        id:com_border
-        Rectangle{
-            color:"transparent"
-            border.width: window.resizeBorderWidth
-            border.color: window.resizeBorderColor
-        }
-    }
     FluLoader{
         id:loader_frameless_helper
     }
@@ -264,22 +257,27 @@ Window {
         FluWindowLifecycle{
             id:lifecycle
         }
-//        FluLoader{
+        Rectangle{
-//            id:loader_border
+            anchors.fill: parent
-//            anchors.fill: parent
+            color:"transparent"
-//            sourceComponent: {
+            border.width: window.resizeBorderWidth
-//                if(window.useSystemAppBar){
+            border.color: window.resizeBorderColor
-//                    return undefined
+            visible: {
-//                }
+                if(window.useSystemAppBar || FluTools.isWindows10OrGreater()){
-//                if(FluTools.isWindows10OrGreater()){
+                    return false
-//                    return undefined
+                }
-//                }
+                if(FluTools.isMacos()){
-//                if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
+                    if(window.visibility == Window.FullScreen){
-//                    return undefined
+                        return false
-//                }
+                    }
-//                return com_border
+                }else{
-//            }
+                    if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
-//        }
+                        return false
+                    }
+                }
+                return true
+            }
+        }
     }
     function destoryOnClose(){
         lifecycle.onDestoryOnClose()