example/example_en_US.ts

@@ -1968,7 +1968,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="499"/>
+        <location filename="qml/page/T_TableView.qml" line="478"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,57 +1988,57 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="358"/>
+        <location filename="qml/page/T_TableView.qml" line="337"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="433"/>
+        <location filename="qml/page/T_TableView.qml" line="412"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="494"/>
+        <location filename="qml/page/T_TableView.qml" line="473"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="512"/>
+        <location filename="qml/page/T_TableView.qml" line="491"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="520"/>
+        <location filename="qml/page/T_TableView.qml" line="498"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="527"/>
+        <location filename="qml/page/T_TableView.qml" line="505"/>
         <source>Long String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="535"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="554"/>
+        <location filename="qml/page/T_TableView.qml" line="532"/>
         <source>&lt;Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="555"/>
+        <location filename="qml/page/T_TableView.qml" line="533"/>
         <source>Next&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="440"/>
+        <location filename="qml/page/T_TableView.qml" line="419"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="464"/>
+        <location filename="qml/page/T_TableView.qml" line="443"/>
         <source>Add a row of Data</source>
         <translation type="unfinished"></translation>
     </message>

example/example_zh_CN.ts

@@ -2110,7 +2110,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="499"/>
+        <location filename="qml/page/T_TableView.qml" line="478"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -2130,57 +2130,57 @@ Some contents...</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="358"/>
+        <location filename="qml/page/T_TableView.qml" line="337"/>
         <source>Age</source>
         <translation type="unfinished">年龄</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="433"/>
+        <location filename="qml/page/T_TableView.qml" line="412"/>
         <source>Clear All</source>
         <translation type="unfinished">清除所有</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="494"/>
+        <location filename="qml/page/T_TableView.qml" line="473"/>
         <source>Avatar</source>
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="512"/>
+        <location filename="qml/page/T_TableView.qml" line="491"/>
         <source>Address</source>
         <translation type="unfinished">地址</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="520"/>
+        <location filename="qml/page/T_TableView.qml" line="498"/>
         <source>Nickname</source>
         <translation type="unfinished">昵称</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="527"/>
+        <location filename="qml/page/T_TableView.qml" line="505"/>
         <source>Long String</source>
         <translation type="unfinished">长字符串</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="535"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Options</source>
         <translation type="unfinished">操作</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="554"/>
+        <location filename="qml/page/T_TableView.qml" line="532"/>
         <source>&lt;Previous</source>
         <translation type="unfinished">&lt;上一页</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="555"/>
+        <location filename="qml/page/T_TableView.qml" line="533"/>
         <source>Next&gt;</source>
         <translation type="unfinished">下一页&gt;</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="440"/>
+        <location filename="qml/page/T_TableView.qml" line="419"/>
         <source>Delete Selection</source>
         <translation type="unfinished">删除选中</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="464"/>
+        <location filename="qml/page/T_TableView.qml" line="443"/>
         <source>Add a row of Data</source>
         <translation type="unfinished">添加一行数据</translation>
     </message>

example/qml/page/T_TableView.qml

@@ -280,27 +280,6 @@ FluContentPage{
         }
     }
 
-    Component{
-        id:com_auto_suggestbox
-        FluAutoSuggestBox {
-            id: textbox
-            anchors.fill: parent
-            focus: true
-            Component.onCompleted: {
-                var data = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
-                var result = data.map(function(item) {
-                    return {title: item};
-                });
-                items = result
-                textbox.text= String(display)
-            }
-            onCommit: {
-                editTextChaged(textbox.text)
-                tableView.closeEditor()
-            }
-        }
-    }
-
     Component{
         id:com_avatar
         Item{
@@ -511,7 +490,6 @@ FluContentPage{
             {
                 title: qsTr("Address"),
                 dataIndex: 'address',
-                editDelegate: com_auto_suggestbox,
                 width:200,
                 minimumWidth:100,
                 maximumWidth:250

example/qml/window/MainWindow.qml

@@ -15,7 +15,7 @@ FluWindow {
     title: "FluentUI"
     width: 1000
     height: 680
-    minimumWidth: 680
+    minimumWidth: 1000
     minimumHeight: 200
     launchMode: FluWindowType.SingleTask
     fitsAppBarWindows: true

src/FluFrameless.cpp

@@ -141,6 +141,7 @@ void FluFrameless::componentComplete() {
     const auto uMsg = msg->message;
     const auto wParam = msg->wParam;
     const auto lParam = msg->lParam;
+    static QPoint offsetXY;
     if (uMsg == WM_WINDOWPOSCHANGING) {
         auto *wp = reinterpret_cast<WINDOWPOS *>(lParam);
         if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0) {
@@ -162,6 +163,10 @@ void FluFrameless::componentComplete() {
         }
         int offsetSize;
         bool isMaximum = ::IsZoomed(hwnd);
+        auto _offsetXY = QPoint(abs(clientRect->left - originalLeft), abs(clientRect->top - originalTop));
+        if (_offsetXY.x() != 0) {
+            offsetXY = _offsetXY;
+        }
         if (isMaximum || _isFullScreen()) {
             offsetSize = 0;
         } else {
@@ -170,10 +175,19 @@ void FluFrameless::componentComplete() {
         if (!isCompositionEnabled()) {
             offsetSize = 0;
         }
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         clientRect->top = originalTop + offsetSize;
         clientRect->bottom = originalBottom - offsetSize;
         clientRect->left = originalLeft + offsetSize;
         clientRect->right = originalRight - offsetSize;
+#else
+        if (!isMaximum) {
+            clientRect->top = originalTop + offsetSize;
+            clientRect->bottom = originalBottom - offsetSize;
+            clientRect->left = originalLeft + offsetSize;
+            clientRect->right = originalRight - offsetSize;
+        }
+#endif
         _setMaximizeHovered(false);
         *result = WVR_REDRAW;
         return true;
@@ -252,15 +266,27 @@ void FluFrameless::componentComplete() {
         return true;
     } else if (uMsg == WM_GETMINMAXINFO) {
         auto *minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+        minmaxInfo->ptMaxPosition.x = 0;
+        minmaxInfo->ptMaxPosition.y = 0;
+        minmaxInfo->ptMaxSize.x = 0;
+        minmaxInfo->ptMaxSize.y = 0;
+        return false;
+#else
         auto pixelRatio = window()->devicePixelRatio();
         auto geometry = window()->screen()->availableGeometry();
         RECT rect;
         SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
-        minmaxInfo->ptMaxPosition.x = rect.left;
+        if (!_fixSize) {
-        minmaxInfo->ptMaxPosition.y = rect.top;
+            minmaxInfo->ptMinTrackSize.x = qRound(window()->minimumWidth() * pixelRatio + offsetXY.x());
-        minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio);
+            minmaxInfo->ptMinTrackSize.y = qRound(window()->minimumHeight() * pixelRatio + offsetXY.y() + _appbar->height() * pixelRatio);
-        minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio);
+        }
-        return false;
+        minmaxInfo->ptMaxPosition.x = rect.left - offsetXY.x();
+        minmaxInfo->ptMaxPosition.y = rect.top - offsetXY.x();
+        minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio) + offsetXY.x() * 2;
+        minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio) + offsetXY.y() * 2;
+        return true;
+#endif
     } else if (uMsg == WM_NCRBUTTONDOWN) {
         if (wParam == HTCAPTION) {
             _showSystemMenu(QCursor::pos());

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

@@ -7,7 +7,6 @@ FluTextBox{
     property var items:[]
     property string emptyText: qsTr("No results found")
     property int autoSuggestBoxReplacement: FluentIcons.Search
-    property string textRole: "title"
     property var filter: function(item){
         if(item.title.indexOf(control.text)!==-1){
             return true
@@ -26,7 +25,7 @@ FluTextBox{
         function handleClick(modelData){
             control_popup.visible = false
             control.itemClicked(modelData)
-            control.updateText(modelData[textRole])
+            control.updateText(modelData.title)
         }
         function loadData(){
             var result = []
@@ -49,6 +48,7 @@ FluTextBox{
     }
     Popup{
         id:control_popup
+        y:control.height
         focus: false
         padding: 0
         enter: Transition {
@@ -62,7 +62,7 @@ FluTextBox{
         contentItem: FluClip{
             radius: [5,5,5,5]
             ListView{
-                id: list_view
+                id:list_view
                 anchors.fill: parent
                 clip: true
                 boundsBehavior: ListView.StopAtBounds
@@ -72,7 +72,7 @@ FluTextBox{
                     height: visible ? 38 : 0
                     visible: list_view.count === 0
                     FluText{
-                        text: emptyText
+                        text:emptyText
                         anchors{
                             verticalCenter: parent.verticalCenter
                             left: parent.left
@@ -81,10 +81,10 @@ FluTextBox{
                     }
                 }
                 delegate:FluControl{
-                    id: item_control
+                    id:item_control
                     height: 38
                     width: control.width
-                    onClicked: {
+                    onClicked:{
                         d.handleClick(modelData)
                     }
                     background: Rectangle{
@@ -103,7 +103,7 @@ FluTextBox{
                         }
                     }
                     contentItem: FluText{
-                        text: modelData[textRole]
+                        text:modelData.title
                         leftPadding: 10
                         rightPadding: 10
                         verticalAlignment : Qt.AlignVCenter
@@ -128,7 +128,7 @@ FluTextBox{
         if(d.flagVisible){
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+rect_background.implicitHeight){
-                control_popup.y = Qt.binding(function(){return control.height})
+                control_popup.y = control.height
             } else if(pos.y>rect_background.implicitHeight){
                 control_popup.y = -rect_background.implicitHeight
             } else {

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

@@ -196,11 +196,6 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
-            TableView.onPooled: {
-                if(d.editPosition && d.editPosition.row === row && d.editPosition.column === column){
-                    control.closeEditor()
-                }
-            }
             property var rowObject : control.getRow(row)
             property var itemModel: model
             property bool editVisible: {
@@ -279,9 +274,9 @@ Rectangle {
                         if(typeof(display) == "object"){
                             return
                         }
-                        loader_edit.display = display
                         d.editDelegate = d.getEditDelegate(column)
                         updateEditPosition()
+                        loader_edit.display = display
                     }
                     onClicked:
                         (event)=>{

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

@@ -6,7 +6,6 @@ FluTextBox{
     property var items:[]
     property string emptyText: qsTr("No results found")
     property int autoSuggestBoxReplacement: FluentIcons.Search
-    property string textRole: "title"
     property var filter: function(item){
         if(item.title.indexOf(control.text)!==-1){
             return true
@@ -25,7 +24,7 @@ FluTextBox{
         function handleClick(modelData){
             control_popup.visible = false
             control.itemClicked(modelData)
-            control.updateText(modelData[textRole])
+            control.updateText(modelData.title)
         }
         function loadData(){
             var result = []
@@ -48,6 +47,7 @@ FluTextBox{
     }
     Popup{
         id:control_popup
+        y:control.height
         focus: false
         padding: 0
         enter: Transition {
@@ -61,7 +61,7 @@ FluTextBox{
         contentItem: FluClip{
             radius: [5,5,5,5]
             ListView{
-                id: list_view
+                id:list_view
                 anchors.fill: parent
                 clip: true
                 boundsBehavior: ListView.StopAtBounds
@@ -71,7 +71,7 @@ FluTextBox{
                     height: visible ? 38 : 0
                     visible: list_view.count === 0
                     FluText{
-                        text: emptyText
+                        text:emptyText
                         anchors{
                             verticalCenter: parent.verticalCenter
                             left: parent.left
@@ -80,10 +80,10 @@ FluTextBox{
                     }
                 }
                 delegate:FluControl{
-                    id: item_control
+                    id:item_control
                     height: 38
                     width: control.width
-                    onClicked: {
+                    onClicked:{
                         d.handleClick(modelData)
                     }
                     background: Rectangle{
@@ -102,7 +102,7 @@ FluTextBox{
                         }
                     }
                     contentItem: FluText{
-                        text: modelData[textRole]
+                        text:modelData.title
                         leftPadding: 10
                         rightPadding: 10
                         verticalAlignment : Qt.AlignVCenter
@@ -127,7 +127,7 @@ FluTextBox{
         if(d.flagVisible){
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+rect_background.implicitHeight){
-                control_popup.y = Qt.binding(function(){return control.height})
+                control_popup.y = control.height
             } else if(pos.y>rect_background.implicitHeight){
                 control_popup.y = -rect_background.implicitHeight
             } else {

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

@@ -196,11 +196,6 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
-            TableView.onPooled: {
-                if(d.editPosition && d.editPosition.row === row && d.editPosition.column === column){
-                    control.closeEditor()
-                }
-            }
             property var rowObject : control.getRow(row)
             property var itemModel: model
             property bool editVisible: {
@@ -279,9 +274,9 @@ Rectangle {
                         if(typeof(display) == "object"){
                             return
                         }
-                        loader_edit.display = display
                         d.editDelegate = d.getEditDelegate(column)
                         updateEditPosition()
+                        loader_edit.display = display
                     }
                     onClicked:
                         (event)=>{