diff --git a/example/qml-Qt6/page/T_Captcha.qml b/example/qml-Qt6/page/T_Captcha.qml index f8068e71..e65e0273 100644 --- a/example/qml-Qt6/page/T_Captcha.qml +++ b/example/qml-Qt6/page/T_Captcha.qml @@ -43,6 +43,7 @@ FluScrollablePage{ FluTextBox{ id:text_box placeholderText: "请输入验证码" + Layout.preferredWidth: 240 } FluButton{ text:"verify" diff --git a/example/qml-Qt6/page/T_QRCode.qml b/example/qml-Qt6/page/T_QRCode.qml index be01f8c9..effeaaf0 100644 --- a/example/qml-Qt6/page/T_QRCode.qml +++ b/example/qml-Qt6/page/T_QRCode.qml @@ -31,6 +31,7 @@ FluScrollablePage{ FluTextBox{ id:text_box text:"会磨刀的小猪" + Layout.preferredWidth: 240 } } diff --git a/example/qml-Qt6/page/T_Timeline.qml b/example/qml-Qt6/page/T_Timeline.qml index b28fd5ec..176013ed 100644 --- a/example/qml-Qt6/page/T_Timeline.qml +++ b/example/qml-Qt6/page/T_Timeline.qml @@ -110,6 +110,7 @@ FluScrollablePage{ FluTextBox{ id:text_box text:"Technical testing 2015-09-01" + Layout.preferredWidth: 240 } FluFilledButton{ text:"Append" diff --git a/example/qml-Qt6/page/T_Watermark.qml b/example/qml-Qt6/page/T_Watermark.qml index 3b4aa275..a453e2ab 100644 --- a/example/qml-Qt6/page/T_Watermark.qml +++ b/example/qml-Qt6/page/T_Watermark.qml @@ -29,6 +29,7 @@ FluContentPage{ FluTextBox{ id:text_box text:"会磨刀的小猪" + Layout.preferredWidth: 240 } } diff --git a/example/qml/page/T_Captcha.qml b/example/qml/page/T_Captcha.qml index 6b48a1ac..8031a8b2 100644 --- a/example/qml/page/T_Captcha.qml +++ b/example/qml/page/T_Captcha.qml @@ -44,6 +44,7 @@ FluScrollablePage{ FluTextBox{ id:text_box placeholderText: "请输入验证码" + Layout.preferredWidth: 240 } FluButton{ text:"verify" diff --git a/example/qml/page/T_QRCode.qml b/example/qml/page/T_QRCode.qml index 00de8ad3..9fc84cef 100644 --- a/example/qml/page/T_QRCode.qml +++ b/example/qml/page/T_QRCode.qml @@ -32,6 +32,7 @@ FluScrollablePage{ FluTextBox{ id:text_box text:"会磨刀的小猪" + Layout.preferredWidth: 240 } } diff --git a/example/qml/page/T_Timeline.qml b/example/qml/page/T_Timeline.qml index 09c29e0d..0e718824 100644 --- a/example/qml/page/T_Timeline.qml +++ b/example/qml/page/T_Timeline.qml @@ -111,6 +111,7 @@ FluScrollablePage{ FluTextBox{ id:text_box text:"Technical testing 2015-09-01" + Layout.preferredWidth: 240 } FluFilledButton{ text:"Append" diff --git a/example/qml/page/T_Watermark.qml b/example/qml/page/T_Watermark.qml index 78d4cd8a..f1f18845 100644 --- a/example/qml/page/T_Watermark.qml +++ b/example/qml/page/T_Watermark.qml @@ -30,6 +30,7 @@ FluContentPage{ FluTextBox{ id:text_box text:"会磨刀的小猪" + Layout.preferredWidth: 240 } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml index a532fd5f..821b6b2c 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml @@ -976,7 +976,6 @@ Item { ScrollBar.vertical: FluScrollBar {} ListView{ id:nav_list - clip: true displaced: Transition { NumberAnimation { properties: "x,y" diff --git a/src/Qt5/imports/FluentUI/Controls/FluTour.qml b/src/Qt5/imports/FluentUI/Controls/FluTour.qml index d9febaac..09b54ec6 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTour.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTour.qml @@ -120,8 +120,18 @@ Popup{ width: 500 height: 88 + text_desc.height color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) + property int dir : { + if(yd.windowHeight) + return d.pos.y-height-control.targetMargins - 15 + return ty + } border.width: 0 FluShadow{ radius: 5 @@ -194,9 +204,9 @@ Popup{ } } FluIcon{ - iconSource: FluentIcons.FlickDown + iconSource: layout_panne.dir?FluentIcons.FlickUp:FluentIcons.FlickDown color: layout_panne.color x: d.pos.x+d.target.width/2-10 - y: d.pos.y+d.target.height + y: d.pos.y+(layout_panne.dir?-height:d.target.height) } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml index 7c284e08..fedc7443 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml @@ -977,7 +977,6 @@ Item { ScrollBar.vertical: FluScrollBar {} ListView{ id:nav_list - clip: true displaced: Transition { NumberAnimation { properties: "x,y" diff --git a/src/Qt6/imports/FluentUI/Controls/FluTour.qml b/src/Qt6/imports/FluentUI/Controls/FluTour.qml index 4fb4b2de..d411ec8a 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTour.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTour.qml @@ -109,8 +109,12 @@ Popup{ width: 500 height: 88 + text_desc.height color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) + property int dir : (yd.window?.height)?(d.pos.y-height-control.targetMargins - 15):ty + } border.width: 0 FluShadow{ radius: 5 @@ -183,9 +187,9 @@ Popup{ } } FluIcon{ - iconSource: FluentIcons.FlickDown + iconSource: layout_panne.dir?FluentIcons.FlickUp:FluentIcons.FlickDown color: layout_panne.color x: d.pos.x+d.target.width/2-10 - y: d.pos.y+d.target.height + y: d.pos.y+(layout_panne.dir?-height:d.target.height) } }