From cc4e88adbd4ee2eb8d7a52ffeb3b4bf8f22299b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 2 Jan 2024 22:55:17 +0800 Subject: [PATCH] update --- example/qml-Qt6/page/T_TabView.qml | 4 +- example/qml/page/T_TabView.qml | 4 +- src/Def.h | 2 +- .../imports/FluentUI/Controls/FluAppBar.qml | 1 + .../imports/FluentUI/Controls/FluTabView.qml | 2 +- src/Qt5/imports/FluentUI/plugins.qmltypes | 39 ++++++++++--------- .../imports/FluentUI/Controls/FluAppBar.qml | 1 + .../imports/FluentUI/Controls/FluTabView.qml | 2 +- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/example/qml-Qt6/page/T_TabView.qml b/example/qml-Qt6/page/T_TabView.qml index e50f4de1..d86788a8 100644 --- a/example/qml-Qt6/page/T_TabView.qml +++ b/example/qml-Qt6/page/T_TabView.qml @@ -67,10 +67,10 @@ FluScrollablePage{ text:"Always" Layout.preferredWidth: 120 FluMenuItem{ - text:"Nerver" + text:"Never" onClicked: { btn_close_button_visibility.text = text - tab_view.closeButtonVisibility = FluTabViewType.Nerver + tab_view.closeButtonVisibility = FluTabViewType.Never } } FluMenuItem{ diff --git a/example/qml/page/T_TabView.qml b/example/qml/page/T_TabView.qml index 16ebd38a..c23fd0cb 100644 --- a/example/qml/page/T_TabView.qml +++ b/example/qml/page/T_TabView.qml @@ -68,10 +68,10 @@ FluScrollablePage{ text:"Always" Layout.preferredWidth: 120 FluMenuItem{ - text:"Nerver" + text:"Never" onClicked: { btn_close_button_visibility.text = text - tab_view.closeButtonVisibility = FluTabViewType.Nerver + tab_view.closeButtonVisibility = FluTabViewType.Never } } FluMenuItem{ diff --git a/src/Def.h b/src/Def.h index 336ed9f1..30278035 100644 --- a/src/Def.h +++ b/src/Def.h @@ -145,7 +145,7 @@ enum TabWidthBehavior { }; Q_ENUM_NS(TabWidthBehavior) enum CloseButtonVisibility { - Nerver = 0x0000, + Never = 0x0000, Always = 0x0001, OnHover = 0x0002 }; diff --git a/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml b/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml index d6897725..1c4b7535 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluAppBar.qml @@ -44,6 +44,7 @@ Rectangle{ d.win.visibility = Window.Windowed else d.win.visibility = Window.Maximized + d.hoverMaxBtn = false } } property var minClickListener: function(){ diff --git a/src/Qt5/imports/FluentUI/Controls/FluTabView.qml b/src/Qt5/imports/FluentUI/Controls/FluTabView.qml index 669f31b7..42e3e6d2 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTabView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTabView.qml @@ -236,7 +236,7 @@ Item { width: visible ? 24 : 0 height: 24 visible: { - if(closeButtonVisibility === FluTabViewType.Nerver) + if(closeButtonVisibility === FluTabViewType.Never) return false if(closeButtonVisibility === FluTabViewType.OnHover) return item_mouse_hove.containsMouse || item_btn_close.hovered diff --git a/src/Qt5/imports/FluentUI/plugins.qmltypes b/src/Qt5/imports/FluentUI/plugins.qmltypes index b5da91c8..03fdc3ca 100644 --- a/src/Qt5/imports/FluentUI/plugins.qmltypes +++ b/src/Qt5/imports/FluentUI/plugins.qmltypes @@ -80,6 +80,8 @@ Module { prototype: "QObject" exports: ["FluentUI/FluFramelessHelper 1.0"] exportMetaObjectRevisions: [0] + Signal { name: "loadCompleted" } + Method { name: "showSystemMenu" } } Component { name: "FluNavigationViewType" @@ -186,7 +188,7 @@ Module { Enum { name: "CloseButtonVisibility" values: { - "Nerver": 0, + "Never": 0, "Always": 1, "OnHover": 2 } @@ -2341,11 +2343,13 @@ Module { Property { name: "closeClickListener"; type: "QVariant" } Property { name: "stayTopClickListener"; type: "QVariant" } Property { name: "darkClickListener"; type: "QVariant" } + Property { name: "systemMenuListener"; type: "QVariant" } Method { name: "stayTopButton"; type: "QVariant" } Method { name: "minimizeButton"; type: "QVariant" } Method { name: "maximizeButton"; type: "QVariant" } Method { name: "closeButton"; type: "QVariant" } Method { name: "darkButton"; type: "QVariant" } + Method { name: "maximizeButtonHover"; type: "QVariant" } } Component { prototype: "QQuickRectangle" @@ -3013,15 +3017,15 @@ Module { defaultProperty: "data" Property { name: "logo"; type: "QUrl" } Property { name: "title"; type: "string" } - Property { name: "items"; type: "FluObject_QMLTYPE_125"; isPointer: true } - Property { name: "footerItems"; type: "FluObject_QMLTYPE_125"; isPointer: true } + Property { name: "items"; type: "FluObject_QMLTYPE_157"; isPointer: true } + Property { name: "footerItems"; type: "FluObject_QMLTYPE_157"; 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_34"; isPointer: true } - Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_34"; isPointer: true } + Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_45"; isPointer: true } + Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_45"; isPointer: true } Property { name: "navCompactWidth"; type: "int" } Property { name: "navTopMargin"; type: "int" } Property { name: "cellHeight"; type: "int" } @@ -3109,21 +3113,17 @@ Module { Property { name: "_ext"; type: "QVariant" } Property { name: "_parent"; type: "QVariant" } Property { name: "title"; type: "string" } - Property { name: "order"; type: "int" } Property { name: "url"; type: "QVariant" } Property { name: "disabled"; type: "bool" } Property { name: "icon"; type: "int" } Property { name: "iconVisible"; type: "bool" } Property { name: "infoBadge"; type: "QQmlComponent"; isPointer: true } - Property { name: "recentlyAdded"; type: "bool" } - Property { name: "recentlyUpdated"; type: "bool" } - Property { name: "desc"; type: "string" } - Property { name: "image"; type: "QVariant" } Property { name: "count"; type: "int" } Property { name: "onTapListener"; type: "QVariant" } Property { name: "iconDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "menuDelegate"; type: "QQmlComponent"; isPointer: true } Property { name: "editDelegate"; type: "QQmlComponent"; isPointer: true } + Property { name: "extra"; type: "QVariant" } Property { name: "showEdit"; type: "bool" } Signal { name: "tap" } } @@ -3534,13 +3534,6 @@ Module { } Method { name: "count"; type: "QVariant" } } - Component { - prototype: "QQmlTableModelColumn" - name: "FluentUI/FluTableModelColumn 1.0" - exports: ["FluentUI/FluTableModelColumn 1.0"] - exportMetaObjectRevisions: [0] - isComposite: true - } Component { prototype: "QQuickRectangle" name: "FluentUI/FluTableView 1.0" @@ -3798,7 +3791,15 @@ Module { Property { name: "resizeBorderColor"; type: "QColor" } Property { name: "resizeBorderWidth"; type: "int" } Property { name: "closeListener"; type: "QVariant" } + Property { name: "_offsetXY"; type: "QPointF" } + Property { name: "_originalPos"; type: "QVariant" } + Property { name: "_accentColor"; type: "QColor" } + Property { name: "_realHeight"; type: "int" } + Property { name: "_realWidth"; type: "int" } + Property { name: "_appBarHeight"; type: "int" } + Property { name: "_enableMarginsBottomLeftRight"; type: "bool" } Property { name: "content"; type: "QObject"; isList: true; isReadonly: true } + Signal { name: "showSystemMenu" } Signal { name: "initArgument" Parameter { name: "argument"; type: "QVariant" } @@ -3846,12 +3847,14 @@ Module { Parameter { name: "path"; type: "QVariant" } } Method { name: "moveWindowToDesktopCenter"; type: "QVariant" } + Method { name: "fixWindowSize"; type: "QVariant" } Method { name: "onResult" type: "QVariant" Parameter { name: "data"; type: "QVariant" } } - Method { name: "containerItem"; type: "QVariant" } + Method { name: "layoutContainer"; type: "QVariant" } + Method { name: "layoutContent"; type: "QVariant" } } Component { prototype: "QQuickRow" diff --git a/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml b/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml index dc1ce75f..b4d54735 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluAppBar.qml @@ -44,6 +44,7 @@ Rectangle{ d.win.visibility = Window.Windowed else d.win.visibility = Window.Maximized + d.hoverMaxBtn = false } } property var minClickListener: function(){ diff --git a/src/Qt6/imports/FluentUI/Controls/FluTabView.qml b/src/Qt6/imports/FluentUI/Controls/FluTabView.qml index 4fde0a5a..2b02f90c 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTabView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTabView.qml @@ -236,7 +236,7 @@ Item { width: visible ? 24 : 0 height: 24 visible: { - if(closeButtonVisibility === FluTabViewType.Nerver) + if(closeButtonVisibility === FluTabViewType.Never) return false if(closeButtonVisibility === FluTabViewType.OnHover) return item_mouse_hove.containsMouse || item_btn_close.hovered