update

example/example.qrc

@@ -181,7 +181,7 @@
         <file>res/image/bg_scenic.png</file>
         <file>res/image/image_1.jpg</file>
         <file>qml/window/PageWindow.qml</file>
-        <file>qml/page/T_StaggeredView.qml</file>
+        <file>qml/page/T_StaggeredLayout.qml</file>
         <file>qml/viewmodel/SettingsViewModel.qml</file>
         <file>qml/viewmodel/TextBoxViewModel.qml</file>
         <file>qml/page/T_Clip.qml</file>

example/qml-Qt6/component/CodeExpander.qml

@@ -136,7 +136,7 @@ FluExpander{
                     "FluTimeline",
                     "FluChart",
                     "FluRangeSlider",
-                    "FluStaggeredView",
+                    "FluStaggeredLayout",
                     "FluProgressButton",
                     "FluLoadingButton",
                     "FluClip",

example/qml-Qt6/global/ItemsOriginal.qml

@@ -210,12 +210,6 @@ FluObject{
             url:"qrc:/example/qml/page/T_Expander.qml"
             onTap:{ navigationView.push(url) }
         }
-        FluPaneItem{
-            title:"StaggeredView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_StaggeredView.qml"
-            onTap:{ navigationView.push(url) }
-        }
         FluPaneItem{
             title:"Watermark"
             menuDelegate: paneItemMenu
@@ -224,6 +218,17 @@ FluObject{
         }
     }
 
+    FluPaneItemExpander{
+        title:Lang.layout
+        icon:FluentIcons.DockLeft
+        FluPaneItem{
+            title:"StaggeredLayout"
+            menuDelegate: paneItemMenu
+            url:"qrc:/example/qml/page/T_StaggeredLayout.qml"
+            onTap:{ navigationView.push(url) }
+        }
+    }
+
     FluPaneItemExpander{
         title:Lang.popus
         icon:FluentIcons.ButtonMenu

example/qml-Qt6/global/Lang.qml

@@ -8,6 +8,7 @@ QtObject {
     property string basic_input
     property string form
     property string surface
+    property string layout
     property string popus
     property string navigation
     property string theming
@@ -34,6 +35,7 @@ QtObject {
         basic_input="基本输入"
         form="表单"
         surface="表面"
+        layout="布局"
         popus="弹窗"
         navigation="导航"
         theming="主题"
@@ -61,6 +63,7 @@ QtObject {
         basic_input="Basic Input"
         form="Form"
         surface="Surfaces"
+        layout="Layout"
         popus="Popus"
         navigation="Navigation"
         theming="Theming"

example/qml-Qt6/page/T_StaggeredLayout.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluContentPage{
 
-    title:"StaggeredView"
+    title:"StaggeredLayout"
 
     property var colors : [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
 
@@ -32,7 +32,7 @@ FluContentPage{
         contentHeight: staggered_view.implicitHeight
         clip: true
         ScrollBar.vertical: FluScrollBar {}
-        FluStaggeredView{
+        FluStaggeredLayout{
             id:staggered_view
             width: parent.width
             itemWidth: 160

example/qml/component/CodeExpander.qml

@@ -136,7 +136,7 @@ FluExpander{
                     "FluTimeline",
                     "FluChart",
                     "FluRangeSlider",
-                    "FluStaggeredView",
+                    "FluStaggeredLayout",
                     "FluProgressButton",
                     "FluLoadingButton",
                     "FluClip",

example/qml/global/ItemsOriginal.qml

@@ -210,12 +210,6 @@ FluObject{
             url:"qrc:/example/qml/page/T_Expander.qml"
             onTap:{ navigationView.push(url) }
         }
-        FluPaneItem{
-            title:"StaggeredView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_StaggeredView.qml"
-            onTap:{ navigationView.push(url) }
-        }
         FluPaneItem{
             title:"Watermark"
             menuDelegate: paneItemMenu
@@ -224,6 +218,17 @@ FluObject{
         }
     }
 
+    FluPaneItemExpander{
+        title:Lang.layout
+        icon:FluentIcons.DockLeft
+        FluPaneItem{
+            title:"StaggeredLayout"
+            menuDelegate: paneItemMenu
+            url:"qrc:/example/qml/page/T_StaggeredLayout.qml"
+            onTap:{ navigationView.push(url) }
+        }
+    }
+
     FluPaneItemExpander{
         title:Lang.popus
         icon:FluentIcons.ButtonMenu

example/qml/global/Lang.qml

@@ -8,6 +8,7 @@ QtObject {
     property string basic_input
     property string form
     property string surface
+    property string layout
     property string popus
     property string navigation
     property string theming
@@ -34,6 +35,7 @@ QtObject {
         basic_input="基本输入"
         form="表单"
         surface="表面"
+        layout="布局"
         popus="弹窗"
         navigation="导航"
         theming="主题"
@@ -61,6 +63,7 @@ QtObject {
         basic_input="Basic Input"
         form="Form"
         surface="Surfaces"
+        layout="Layout"
         popus="Popus"
         navigation="Navigation"
         theming="Theming"

example/qml/page/T_StaggeredLayout.qml

@@ -7,7 +7,7 @@ import FluentUI 1.0
 
 FluContentPage{
 
-    title:"StaggeredView"
+    title:"StaggeredLayout"
 
     property var colors : [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
 
@@ -33,7 +33,7 @@ FluContentPage{
         contentHeight: staggered_view.implicitHeight
         clip: true
         ScrollBar.vertical: FluScrollBar {}
-        FluStaggeredView{
+        FluStaggeredLayout{
             id:staggered_view
             width: parent.width
             itemWidth: 160

src/FluentUI.cpp

@@ -131,12 +131,12 @@ void FluentUI::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluTreeView.qml"),uri,major,minor,"FluTreeView");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluWindow.qml"),uri,major,minor,"FluWindow");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluRangeSlider.qml"),uri,major,minor,"FluRangeSlider");
-    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluStaggeredView.qml"),uri,major,minor,"FluStaggeredView");
+    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluStaggeredLayout.qml"),uri,major,minor,"FluStaggeredLayout");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluProgressButton.qml"),uri,major,minor,"FluProgressButton");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLoadingButton.qml"),uri,major,minor,"FluLoadingButton");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluClip.qml"),uri,major,minor,"FluClip");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluLoader.qml"),uri,major,minor,"FluLoader");
-
+    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluShortcutPicker.qml"),uri,major,minor,"FluShortcutPicker");
 
     qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject,  uri,major,minor,"FluentIcons", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluThemeType::staticMetaObject,  uri,major,minor,"FluThemeType", "Access to enums & flags only");

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

@@ -64,7 +64,15 @@ TextArea{
         anchors.fill: parent
         cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onClicked: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: {
+            if(control.echoMode === TextInput.Password){
+                return
+            }
+            if(control.readOnly && control.text === ""){
+                return
+            }
+            menu.popup()
+        }
     }
     FluTextBoxMenu{
         id:menu

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

@@ -62,7 +62,15 @@ TextField{
         anchors.fill: parent
         cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onClicked: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: {
+            if(control.echoMode === TextInput.Password){
+                return
+            }
+            if(control.readOnly && control.text === ""){
+                return
+            }
+            menu.popup()
+        }
     }
     RowLayout{
         height: parent.height

src/Qt5/imports/fluentui.qrc

@@ -69,7 +69,7 @@
         <file>FluentUI/Controls/FluShadow.qml</file>
         <file>FluentUI/Controls/FluSlider.qml</file>
         <file>FluentUI/Controls/FluSpinBox.qml</file>
-        <file>FluentUI/Controls/FluStaggeredView.qml</file>
+        <file>FluentUI/Controls/FluStaggeredLayout.qml</file>
         <file>FluentUI/Controls/FluStatusView.qml</file>
         <file>FluentUI/Controls/FluTableView.qml</file>
         <file>FluentUI/Controls/FluTabView.qml</file>

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

@@ -65,7 +65,15 @@ TextArea{
         anchors.fill: parent
         cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onClicked: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: {
+            if(control.echoMode === TextInput.Password){
+                return
+            }
+            if(control.readOnly && control.text === ""){
+                return
+            }
+            menu.popup()
+        }
     }
     FluTextBoxMenu{
         id:menu

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

@@ -63,7 +63,15 @@ TextField{
         anchors.fill: parent
         cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onClicked: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: {
+            if(control.echoMode === TextInput.Password){
+                return
+            }
+            if(control.readOnly && control.text === ""){
+                return
+            }
+            menu.popup()
+        }
     }
     RowLayout{
         height: parent.height