amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 21:37:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert WrapAnywhere toWordWrap

Browse Source 
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?
This commit is contained in:
Gaëtan Dezeiraud 2024-11-16 19:58:55 +01:00
parent d82e0ed529
commit e0892fdb66
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
View File

@ -41,7 +41,7 @@ FluPopup {
FluText{ FluText{
id:text_message id:text_message
font: FluTextStyle.Body font: FluTextStyle.Body
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
text:message text:message
width: parent.width width: parent.width
topPadding: 4 topPadding: 4
@ -67,7 +67,7 @@ FluPopup {
topPadding: 20 topPadding: 20
leftPadding: 20 leftPadding: 20
rightPadding: 20 rightPadding: 20
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
} }
FluLoader{ FluLoader{
sourceComponent: com_message sourceComponent: com_message

4
src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -190,13 +190,13 @@ FluObject {
spacing: 5 spacing: 5
FluText{ FluText{
text:_super.text text:_super.text
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
width: Math.min(implicitWidth,mcontrol.maxWidth) width: Math.min(implicitWidth,mcontrol.maxWidth)
} }
FluText{ FluText{
text: _super.moremsg text: _super.moremsg
visible: _super.moremsg visible: _super.moremsg
wrapMode : Text.WrapAnywhere wrapMode : Text.WordWrap
textColor: FluColors.Grey120 textColor: FluColors.Grey120
width: Math.min(implicitWidth,mcontrol.maxWidth) width: Math.min(implicitWidth,mcontrol.maxWidth)
} }

2
src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -20,7 +20,7 @@ TextArea{
return normalColor return normalColor
} }
font:FluTextStyle.Body font:FluTextStyle.Body
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
padding: 8 padding: 8
leftPadding: padding+4 leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

4
src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
View File

@ -98,7 +98,7 @@ Item{
Component{ Component{
id:com_lable id:com_lable
FluText{ FluText{
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: { text: {
if(modelData.lable){ if(modelData.lable){
@ -113,7 +113,7 @@ Item{
Component{ Component{
id:com_text id:com_text
FluText{ FluText{
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.text text: modelData.text
textFormat: Text.RichText textFormat: Text.RichText

2
src/Qt5/imports/FluentUI/Controls/FluTour.qml
View File

@ -175,7 +175,7 @@ Popup{
FluText{ FluText{
id: text_desc id: text_desc
font: FluTextStyle.Body font: FluTextStyle.Body
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
maximumLineCount: 4 maximumLineCount: 4
elide: Text.ElideRight elide: Text.ElideRight
text: { text: {

4
src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
View File

@ -41,7 +41,7 @@ FluPopup {
FluText{ FluText{
id:text_message id:text_message
font: FluTextStyle.Body font: FluTextStyle.Body
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
text:message text:message
width: parent.width width: parent.width
topPadding: 4 topPadding: 4
@ -67,7 +67,7 @@ FluPopup {
topPadding: 20 topPadding: 20
leftPadding: 20 leftPadding: 20
rightPadding: 20 rightPadding: 20
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
} }
FluLoader{ FluLoader{
sourceComponent: com_message sourceComponent: com_message

4
src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -190,13 +190,13 @@ FluObject {
spacing: 5 spacing: 5
FluText{ FluText{
text:_super.text text:_super.text
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
width: Math.min(implicitWidth,mcontrol.maxWidth) width: Math.min(implicitWidth,mcontrol.maxWidth)
} }
FluText{ FluText{
text: _super.moremsg text: _super.moremsg
visible: _super.moremsg visible: _super.moremsg
wrapMode : Text.WrapAnywhere wrapMode : Text.WordWrap
textColor: FluColors.Grey120 textColor: FluColors.Grey120
width: Math.min(implicitWidth,mcontrol.maxWidth) width: Math.min(implicitWidth,mcontrol.maxWidth)
} }

2
src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -21,7 +21,7 @@ TextArea{
return normalColor return normalColor
} }
font:FluTextStyle.Body font:FluTextStyle.Body
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
padding: 8 padding: 8
leftPadding: padding+4 leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

4
src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
View File

@ -98,7 +98,7 @@ Item{
Component{ Component{
id:com_lable id:com_lable
FluText{ FluText{
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: { text: {
if(modelData.lable){ if(modelData.lable){
@ -113,7 +113,7 @@ Item{
Component{ Component{
id:com_text id:com_text
FluText{ FluText{
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.text text: modelData.text
textFormat: Text.RichText textFormat: Text.RichText

2
src/Qt6/imports/FluentUI/Controls/FluTour.qml
View File

@ -175,7 +175,7 @@ Popup{
FluText{ FluText{
id: text_desc id: text_desc
font: FluTextStyle.Body font: FluTextStyle.Body
wrapMode: Text.WrapAnywhere wrapMode: Text.WordWrap
maximumLineCount: 4 maximumLineCount: 4
elide: Text.ElideRight elide: Text.ElideRight
text: { text: {