From e0892fdb666671bae3a5cb16f77ffe07ca7a3991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Dezeiraud?= Date: Sat, 16 Nov 2024 19:58:55 +0100 Subject: [PATCH] Convert WrapAnywhere toWordWrap Maybe you have a valid reason to use Wrap Anywhere, but for english and french text, it is very unpleasant to read. If this is a problem for Chinese, maybe a global variable to define the behavior? --- src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml | 4 ++-- src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml | 4 ++-- src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml | 2 +- src/Qt5/imports/FluentUI/Controls/FluTimeline.qml | 4 ++-- src/Qt5/imports/FluentUI/Controls/FluTour.qml | 2 +- src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml | 4 ++-- src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml | 4 ++-- src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml | 2 +- src/Qt6/imports/FluentUI/Controls/FluTimeline.qml | 4 ++-- src/Qt6/imports/FluentUI/Controls/FluTour.qml | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml b/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml index b02592f7..48473191 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml @@ -41,7 +41,7 @@ FluPopup { FluText{ id:text_message font: FluTextStyle.Body - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap text:message width: parent.width topPadding: 4 @@ -67,7 +67,7 @@ FluPopup { topPadding: 20 leftPadding: 20 rightPadding: 20 - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap } FluLoader{ sourceComponent: com_message diff --git a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml index 3177a8aa..3e3751a3 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml @@ -190,13 +190,13 @@ FluObject { spacing: 5 FluText{ text:_super.text - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap width: Math.min(implicitWidth,mcontrol.maxWidth) } FluText{ text: _super.moremsg visible: _super.moremsg - wrapMode : Text.WrapAnywhere + wrapMode : Text.WordWrap textColor: FluColors.Grey120 width: Math.min(implicitWidth,mcontrol.maxWidth) } diff --git a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml index 14b0d136..e2b461c1 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml @@ -20,7 +20,7 @@ TextArea{ return normalColor } font:FluTextStyle.Body - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap padding: 8 leftPadding: padding+4 renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering diff --git a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml index e94d1b1a..eddf0305 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTimeline.qml @@ -98,7 +98,7 @@ Item{ Component{ id:com_lable FluText{ - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft text: { if(modelData.lable){ @@ -113,7 +113,7 @@ Item{ Component{ id:com_text FluText{ - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft text: modelData.text textFormat: Text.RichText diff --git a/src/Qt5/imports/FluentUI/Controls/FluTour.qml b/src/Qt5/imports/FluentUI/Controls/FluTour.qml index a0b3e072..d8ff7027 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTour.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTour.qml @@ -175,7 +175,7 @@ Popup{ FluText{ id: text_desc font: FluTextStyle.Body - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap maximumLineCount: 4 elide: Text.ElideRight text: { diff --git a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml b/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml index 6c4ae127..f9a80328 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml @@ -41,7 +41,7 @@ FluPopup { FluText{ id:text_message font: FluTextStyle.Body - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap text:message width: parent.width topPadding: 4 @@ -67,7 +67,7 @@ FluPopup { topPadding: 20 leftPadding: 20 rightPadding: 20 - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap } FluLoader{ sourceComponent: com_message diff --git a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml index 6fac2e08..e081ee1d 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml @@ -190,13 +190,13 @@ FluObject { spacing: 5 FluText{ text:_super.text - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap width: Math.min(implicitWidth,mcontrol.maxWidth) } FluText{ text: _super.moremsg visible: _super.moremsg - wrapMode : Text.WrapAnywhere + wrapMode : Text.WordWrap textColor: FluColors.Grey120 width: Math.min(implicitWidth,mcontrol.maxWidth) } diff --git a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml index 104f0230..21ebf678 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml @@ -21,7 +21,7 @@ TextArea{ return normalColor } font:FluTextStyle.Body - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap padding: 8 leftPadding: padding+4 renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering diff --git a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml index 4477e00e..757459ee 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTimeline.qml @@ -98,7 +98,7 @@ Item{ Component{ id:com_lable FluText{ - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft text: { if(modelData.lable){ @@ -113,7 +113,7 @@ Item{ Component{ id:com_text FluText{ - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft text: modelData.text textFormat: Text.RichText diff --git a/src/Qt6/imports/FluentUI/Controls/FluTour.qml b/src/Qt6/imports/FluentUI/Controls/FluTour.qml index 46c3bbb7..fea6368b 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTour.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTour.qml @@ -175,7 +175,7 @@ Popup{ FluText{ id: text_desc font: FluTextStyle.Body - wrapMode: Text.WrapAnywhere + wrapMode: Text.WordWrap maximumLineCount: 4 elide: Text.ElideRight text: {