update

zhuzichu520 · Apr 4, 2024 · bd8c80f · bd8c80f
1 parent 6b617d1
commit bd8c80f
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 18 deletions.
diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp
@@ -58,6 +58,11 @@ void FluFrameless::componentComplete(){
     }
     _current = window()->winId();
     window()->setFlags(( window()->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::FramelessWindowHint);
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+    if(QQuickWindow::sceneGraphBackend() == "software"){
+        window()->setFlag(Qt::FramelessWindowHint,false);
+    }
+#endif
     if(!_fixSize){
         window()->setFlag(Qt::WindowMaximizeButtonHint);
     }

diff --git a/src/Qt5/imports/FluentUI/plugins.qmltypes b/src/Qt5/imports/FluentUI/plugins.qmltypes
@@ -85,6 +85,7 @@ Module {
             name: "setHitTestVisible"
             Parameter { type: "QQuickItem"; isPointer: true }
         }
+        Method { name: "onDestruction" }
     }
     Component {
         name: "FluNavigationViewType"
@@ -272,7 +273,7 @@ Module {
         exports: ["FluentUI/FluTreeModel 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "dataSourceSize"; type: "int" }
-        Property { name: "selectionModel"; type: "QList<FluNode*>" }
+        Property { name: "selectionModel"; type: "QList<FluTreeNode*>" }
         Method {
             name: "removeRows"
             Parameter { name: "row"; type: "int" }
@@ -281,7 +282,7 @@ Module {
         Method {
             name: "insertRows"
             Parameter { name: "row"; type: "int" }
-            Parameter { name: "data"; type: "QList<FluNode*>" }
+            Parameter { name: "data"; type: "QList<FluTreeNode*>" }
         }
         Method {
             name: "getRow"
@@ -290,7 +291,7 @@ Module {
         }
         Method {
             name: "setData"
-            Parameter { name: "data"; type: "QList<FluNode*>" }
+            Parameter { name: "data"; type: "QList<FluTreeNode*>" }
         }
         Method {
             name: "setDataSource"
@@ -305,14 +306,14 @@ Module {
             Parameter { name: "row"; type: "int" }
         }
         Method {
-            name: "dragAnddrop"
+            name: "dragAndDrop"
             Parameter { name: "dragIndex"; type: "int" }
             Parameter { name: "dropIndex"; type: "int" }
             Parameter { name: "isDropTopArea"; type: "bool" }
         }
         Method {
             name: "getNode"
-            type: "FluNode*"
+            type: "FluTreeNode*"
             Parameter { name: "row"; type: "int" }
         }
         Method {
@@ -322,7 +323,7 @@ Module {
         Method {
             name: "checkRow"
             Parameter { name: "row"; type: "int" }
-            Parameter { name: "chekced"; type: "bool" }
+            Parameter { name: "checked"; type: "bool" }
         }
         Method {
             name: "hitHasChildrenExpanded"
@@ -2512,6 +2513,23 @@ Module {
         defaultProperty: "data"
         Property { name: "contentDescription"; type: "string" }
     }
+    Component {
+        prototype: "QQuickItem"
+        name: "FluentUI/FluControlBackground 1.0"
+        exports: ["FluentUI/FluControlBackground 1.0"]
+        exportMetaObjectRevisions: [0]
+        isComposite: true
+        defaultProperty: "data"
+        Property { name: "radius"; type: "int" }
+        Property { name: "shadow"; type: "bool" }
+        Property { name: "bottomMargin"; type: "QVariant" }
+        Property { name: "topMargin"; type: "QVariant" }
+        Property { name: "leftMargin"; type: "QVariant" }
+        Property { name: "rightMargin"; type: "QVariant" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
+        Property { name: "gradient"; type: "QJSValue" }
+    }
     Component {
         prototype: "QQuickTextEdit"
         name: "FluentUI/FluCopyableText 1.0"
@@ -2580,14 +2598,14 @@ Module {
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "contentData"
+        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "disabled"; type: "bool" }
         Property { name: "contentDescription"; type: "string" }
         Property { name: "normalColor"; type: "QColor" }
         Property { name: "hoverColor"; type: "QColor" }
         Property { name: "disableColor"; type: "QColor" }
+        Property { name: "dividerColor"; type: "QColor" }
         Property { name: "textColor"; type: "QColor" }
-        Property { name: "window"; type: "QVariant" }
-        Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
         prototype: "QObject"
@@ -2914,15 +2932,15 @@ Module {
         defaultProperty: "data"
         Property { name: "logo"; type: "QUrl" }
         Property { name: "title"; type: "string" }
-        Property { name: "items"; type: "FluObject_QMLTYPE_134"; isPointer: true }
-        Property { name: "footerItems"; type: "FluObject_QMLTYPE_134"; isPointer: true }
+        Property { name: "items"; type: "FluObject_QMLTYPE_137"; isPointer: true }
+        Property { name: "footerItems"; type: "FluObject_QMLTYPE_137"; isPointer: true }
         Property { name: "displayMode"; type: "int" }
         Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true }
         Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true }
         Property { name: "topPadding"; type: "int" }
         Property { name: "pageMode"; type: "int" }
-        Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_42"; isPointer: true }
-        Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_42"; isPointer: true }
+        Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_38"; isPointer: true }
+        Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_38"; isPointer: true }
         Property { name: "navCompactWidth"; type: "int" }
         Property { name: "navTopMargin"; type: "int" }
         Property { name: "cellHeight"; type: "int" }
@@ -3121,8 +3139,6 @@ Module {
         defaultProperty: "content"
         Property { name: "textNormalColor"; type: "QColor" }
         Property { name: "textHoverColor"; type: "QColor" }
-        Property { name: "textSize"; type: "int" }
-        Property { name: "textBold"; type: "bool" }
         Property { name: "textSpacing"; type: "int" }
         Property { name: "headerSpacing"; type: "int" }
         Property { name: "headerHeight"; type: "int" }
@@ -3168,12 +3184,14 @@ Module {
         isComposite: true
         defaultProperty: "data"
         Property { name: "progress"; type: "double" }
-        Property { name: "disabled"; type: "bool" }
-        Property { name: "contentDescription"; type: "string" }
         Property { name: "normalColor"; type: "QColor" }
         Property { name: "hoverColor"; type: "QColor" }
         Property { name: "disableColor"; type: "QColor" }
         Property { name: "pressedColor"; type: "QColor" }
+        Property { name: "disabled"; type: "bool" }
+        Property { name: "contentDescription"; type: "string" }
+        Property { name: "dividerColor"; type: "QColor" }
+        Property { name: "textColor"; type: "QColor" }
     }
     Component {
         prototype: "QQuickProgressBar"
@@ -3518,6 +3536,7 @@ Module {
         Property { name: "selectedColor"; type: "QColor" }
         Property { name: "rows"; type: "int"; isReadonly: true }
         Property { name: "columns"; type: "int"; isReadonly: true }
+        Property { name: "current"; type: "QVariant"; isReadonly: true }
         Property { name: "sourceModel"; type: "QQmlTableModel"; isReadonly: true; isPointer: true }
         Method { name: "closeEditor"; type: "QVariant" }
         Method { name: "resetPosition"; type: "QVariant" }
@@ -3590,14 +3609,22 @@ Module {
         }
     }
     Component {
-        prototype: "FluRectangle"
+        prototype: "QQuickItem"
         name: "FluentUI/FluTextBoxBackground 1.0"
         exports: ["FluentUI/FluTextBoxBackground 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
         Property { name: "inputItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "borderWidth"; type: "int" }
+        Property { name: "radius"; type: "int" }
+        Property { name: "shadow"; type: "bool" }
+        Property { name: "bottomMargin"; type: "QVariant" }
+        Property { name: "topMargin"; type: "QVariant" }
+        Property { name: "leftMargin"; type: "QVariant" }
+        Property { name: "rightMargin"; type: "QVariant" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
+        Property { name: "gradient"; type: "QJSValue" }
     }
     Component {
         prototype: "QQuickMenu"