From 41a1775cee98ef5931d66194eba2944f8941d801 Mon Sep 17 00:00:00 2001
From: jeffrey0326 <547913081@qq.com>
Date: Thu, 27 Jun 2024 13:17:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=86=E7=A0=81=E6=A1=86?=
=?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84FluTextBoxMenu,=E4=BF=AE=E6=94=B9Tex?=
=?UTF-8?q?tBox=E4=B8=AD=E7=9A=84=E5=8F=B3=E9=94=AE=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E4=B8=BAFluLoader=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FluentUI/Controls/FluCopyableText.qml | 20 ++++++++++++++++---
.../FluentUI/Controls/FluMultilineTextBox.qml | 20 ++++++++++++++++---
.../FluentUI/Controls/FluPasswordBox.qml | 4 ----
.../imports/FluentUI/Controls/FluTextBox.qml | 20 ++++++++++++++++---
.../FluentUI/Controls/FluCopyableText.qml | 20 ++++++++++++++++---
.../FluentUI/Controls/FluPasswordBox.qml | 4 ----
.../imports/FluentUI/Controls/FluTextBox.qml | 20 ++++++++++++++++---
src/fluentui_en_US.ts | 7 ++++---
src/fluentui_zh_CN.ts | 7 ++++---
9 files changed, 93 insertions(+), 29 deletions(-)
diff --git a/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml b/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml
index b365175c..d5f2cbb6 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml
@@ -26,10 +26,24 @@ TextEdit {
anchors.fill: parent
cursorShape: Qt.IBeamCursor
acceptedButtons: Qt.RightButton
- onClicked: control.echoMode !== TextInput.Password && menu.popup()
+ onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
}
- FluTextBoxMenu{
+ FluLoader{
+ id: menu_loader
+ function popup(){
+ sourceComponent = menu
+ }
+ onLoaded: {
+ item.open()
+ }
+ }
+ Component{
id:menu
- inputItem: control
+ FluTextBoxMenu{
+ inputItem: control
+ onClosed: {
+ menu_loader.sourceComponent = undefined
+ }
+ }
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
index 7b5286ef..70180fc2 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
@@ -71,11 +71,25 @@ TextArea{
if(control.readOnly && control.text === ""){
return
}
- menu.popup()
+ menu_loader.popup()
}
}
- FluTextBoxMenu{
+ FluLoader{
+ id: menu_loader
+ function popup(){
+ sourceComponent = menu
+ }
+ onLoaded: {
+ item.open()
+ }
+ }
+ Component{
id:menu
- inputItem: control
+ FluTextBoxMenu{
+ inputItem: control
+ onClosed: {
+ menu_loader.sourceComponent = undefined
+ }
+ }
}
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml b/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
index de932dd9..ac8e064c 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml
@@ -65,8 +65,4 @@ TextField{
rightMargin: 5
}
}
- FluTextBoxMenu{
- id:menu
- inputItem: control
- }
}
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
index 6564e7fa..16510084 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTextBox.qml
@@ -69,7 +69,7 @@ TextField{
if(control.readOnly && control.text === ""){
return
}
- menu.popup()
+ menu_loader.popup()
}
}
RowLayout{
@@ -111,8 +111,22 @@ TextField{
visible: control.iconSource != 0
}
}
- FluTextBoxMenu{
+ FluLoader{
+ id: menu_loader
+ function popup(){
+ sourceComponent = menu
+ }
+ onLoaded: {
+ item.open()
+ }
+ }
+ Component{
id:menu
- inputItem: control
+ FluTextBoxMenu{
+ inputItem: control
+ onClosed: {
+ menu_loader.sourceComponent = undefined
+ }
+ }
}
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml b/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml
index 7d093294..2437d4e0 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml
@@ -26,10 +26,24 @@ TextEdit {
anchors.fill: parent
cursorShape: Qt.IBeamCursor
acceptedButtons: Qt.RightButton
- onClicked: control.echoMode !== TextInput.Password && menu.popup()
+ onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
}
- FluTextBoxMenu{
+ FluLoader{
+ id: menu_loader
+ function popup(){
+ sourceComponent = menu
+ }
+ onLoaded: {
+ item.open()
+ }
+ }
+ Component{
id:menu
- inputItem: control
+ FluTextBoxMenu{
+ inputItem: control
+ onClosed: {
+ menu_loader.sourceComponent = undefined
+ }
+ }
}
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml b/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
index e75ff1bb..48488420 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml
@@ -66,8 +66,4 @@ TextField{
rightMargin: 5
}
}
- FluTextBoxMenu{
- id:menu
- inputItem: control
- }
}
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml b/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
index 3b335c4e..e48a5417 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTextBox.qml
@@ -70,7 +70,7 @@ TextField{
if(control.readOnly && control.text === ""){
return
}
- menu.popup()
+ menu_loader.popup()
}
}
RowLayout{
@@ -112,8 +112,22 @@ TextField{
visible: control.iconSource != 0
}
}
- FluTextBoxMenu{
+ FluLoader{
+ id: menu_loader
+ function popup(){
+ sourceComponent = menu
+ }
+ onLoaded: {
+ item.open()
+ }
+ }
+ Component{
id:menu
- inputItem: control
+ FluTextBoxMenu{
+ inputItem: control
+ onClosed: {
+ menu_loader.sourceComponent = undefined
+ }
+ }
}
}
diff --git a/src/fluentui_en_US.ts b/src/fluentui_en_US.ts
index 11537df9..25e4a493 100644
--- a/src/fluentui_en_US.ts
+++ b/src/fluentui_en_US.ts
@@ -232,7 +232,8 @@
-
+
+
Conflict
@@ -354,8 +355,8 @@
FluWindow
-
-
+
+
Loading...
diff --git a/src/fluentui_zh_CN.ts b/src/fluentui_zh_CN.ts
index 36bc136b..6480b84c 100644
--- a/src/fluentui_zh_CN.ts
+++ b/src/fluentui_zh_CN.ts
@@ -232,7 +232,8 @@
重置
-
+
+
Conflict
冲突
@@ -354,8 +355,8 @@
FluWindow
-
-
+
+
Loading...
加载中...