This commit is contained in:
朱子楚\zhuzi
2024-03-09 22:19:10 +08:00
parent eff9e385f5
commit 1d5f8772e1
35 changed files with 47 additions and 47 deletions

View File

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

View File

@ -45,7 +45,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: control.enabled ? 1 : 0
topMargin: control.enabled ? 0 : 0
leftMargin: control.enabled ? 1 : 0
rightMargin: control.enabled ? 1 : 0
bottomMargin: control.enabled ? 2 : 0

View File

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

View File

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

View File

@ -141,7 +141,7 @@ Rectangle {
id:item_text
text: String(display)
elide: Text.ElideRight
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
anchors{
fill: parent
leftMargin: 11

View File

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

View File

@ -61,7 +61,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: checked && enabled ? 1 : 0
topMargin: checked && enabled ? 0 : 0
leftMargin: checked && enabled ? 1 : 0
rightMargin: checked && enabled ? 1 : 0
bottomMargin: checked && enabled ? 2 : 0

View File

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

View File

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

View File

@ -46,7 +46,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: control.enabled ? 1 : 0
topMargin: control.enabled ? 0 : 0
leftMargin: control.enabled ? 1 : 0
rightMargin: control.enabled ? 1 : 0
bottomMargin: control.enabled ? 2 : 0

View File

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

View File

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

View File

@ -142,7 +142,7 @@ Rectangle {
id:item_text
text: String(display)
elide: Text.ElideRight
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
anchors{
fill: parent
leftMargin: 11

View File

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

View File

@ -57,7 +57,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: checked && enabled ? 1 : 0
topMargin: checked && enabled ? 0 : 0
leftMargin: checked && enabled ? 1 : 0
rightMargin: checked && enabled ? 1 : 0
bottomMargin: checked && enabled ? 2 : 0

View File

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