diff --git a/example/qml-Qt6/window/AboutWindow.qml b/example/qml-Qt6/window/AboutWindow.qml index fc0300e8..2cd6166b 100644 --- a/example/qml-Qt6/window/AboutWindow.qml +++ b/example/qml-Qt6/window/AboutWindow.qml @@ -19,9 +19,10 @@ FluWindow { left: parent.left right: parent.right } + spacing: 5 RowLayout{ - Layout.topMargin: 20 + Layout.topMargin: 15 Layout.leftMargin: 15 spacing: 14 FluText{ @@ -43,7 +44,6 @@ FluWindow { RowLayout{ spacing: 14 - Layout.topMargin: 20 Layout.leftMargin: 15 FluText{ text:"作者:" @@ -54,6 +54,21 @@ FluWindow { } } + RowLayout{ + spacing: 14 + Layout.leftMargin: 15 + FluText{ + text:"微信号:" + } + FluText{ + text:"FluentUI" + Layout.alignment: Qt.AlignBottom + } + FluText{ + text:"(有啥问题可能不会马上回,但发了红包必须立马回......)" + } + } + RowLayout{ spacing: 14 Layout.leftMargin: 15 diff --git a/example/qml/window/AboutWindow.qml b/example/qml/window/AboutWindow.qml index 1de2b5c3..747f4a71 100644 --- a/example/qml/window/AboutWindow.qml +++ b/example/qml/window/AboutWindow.qml @@ -19,9 +19,10 @@ FluWindow { left: parent.left right: parent.right } + spacing: 5 RowLayout{ - Layout.topMargin: 20 + Layout.topMargin: 10 Layout.leftMargin: 15 spacing: 14 FluText{ @@ -43,7 +44,6 @@ FluWindow { RowLayout{ spacing: 14 - Layout.topMargin: 20 Layout.leftMargin: 15 FluText{ text:"作者:" @@ -54,6 +54,21 @@ FluWindow { } } + RowLayout{ + spacing: 14 + Layout.leftMargin: 15 + FluText{ + text:"微信号:" + } + FluText{ + text:"FluentUI" + Layout.alignment: Qt.AlignBottom + } + FluText{ + text:"(有啥问题可能不会马上回,但发了红包必须立马回......)" + } + } + RowLayout{ spacing: 14 Layout.leftMargin: 15 diff --git a/example/res/template/en_US.ts.in b/example/res/template/en_US.ts.in index aff54b38..5ca70fe1 100644 --- a/example/res/template/en_US.ts.in +++ b/example/res/template/en_US.ts.in @@ -18,5 +18,10 @@ Learn FluentUI + + + Author's WeChat ID: + + diff --git a/example/res/template/main.qml.in b/example/res/template/main.qml.in index 8180a5fd..b85abc24 100644 --- a/example/res/template/main.qml.in +++ b/example/res/template/main.qml.in @@ -32,4 +32,19 @@ FluWindow { } } + Row{ + anchors{ + bottom: parent.bottom + bottomMargin: 14 + horizontalCenter: parent.horizontalCenter + } + FluText{ + text: qsTr("Author's WeChat ID: ") + } + FluText{ + text: "FluentUI" + color: FluTheme.fontSecondaryColor + } + } + } diff --git a/example/res/template/zh_CN.ts.in b/example/res/template/zh_CN.ts.in index 86475ddd..13ec3e4f 100644 --- a/example/res/template/zh_CN.ts.in +++ b/example/res/template/zh_CN.ts.in @@ -18,5 +18,10 @@ Learn FluentUI 学习FluentUI + + + Author's WeChat ID: + 作者微信号: + diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml index 36b0248b..abf904af 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml @@ -34,7 +34,7 @@ Window { property bool showClose: true property bool showMinimize: true property bool showMaximize: true - property bool showStayTop: true + property bool showStayTop: false property bool autoMaximize: false property bool autoVisible: true property bool autoCenter: true diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml index 8da4ac64..87e9ce8a 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml @@ -33,7 +33,7 @@ Window { property bool showClose: true property bool showMinimize: true property bool showMaximize: true - property bool showStayTop: true + property bool showStayTop: false property bool autoMaximize: false property bool autoVisible: true property bool autoCenter: true