From 26ad581072289cb2cf4b91bffb39ceaceb52b5cf Mon Sep 17 00:00:00 2001 From: zhuzichu Date: Fri, 7 Jul 2023 16:56:29 +0800 Subject: [PATCH] update --- example/qml/page/T_Buttons.qml | 28 +++++++++---------- .../FluentUI/Controls/FluAutoSuggestBox.qml | 14 +++++++--- .../FluentUI/Controls/FluDropDownButton.qml | 2 +- .../FluentUI/Controls/FluScrollBar.qml | 13 ++++----- 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/example/qml/page/T_Buttons.qml b/example/qml/page/T_Buttons.qml index be466de7..354d25bb 100644 --- a/example/qml/page/T_Buttons.qml +++ b/example/qml/page/T_Buttons.qml @@ -223,7 +223,7 @@ FluScrollablePage{ FluMenuItem{ text:"Menu_4" onClicked: { - console.debug(parent.height) + } } } @@ -241,20 +241,18 @@ FluScrollablePage{ Layout.topMargin: -1 code:'FluDropDownButton{ text:"DropDownButton" - items:[ - FluMenuItem{ - text:"Menu_1" - }, - FluMenuItem{ - text:"Menu_2" - }, - FluMenuItem{ - text:"Menu_3" - }, - FluMenuItem{ - text:"Menu_4" - } - ] + FluMenuItem{ + text:"Menu_1" + }, + FluMenuItem{ + text:"Menu_2" + }, + FluMenuItem{ + text:"Menu_3" + }, + FluMenuItem{ + text:"Menu_4" + } }' } diff --git a/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml b/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml index ca3d89b6..0b19c469 100644 --- a/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml +++ b/src/imports/FluentUI/Controls/FluAutoSuggestBox.qml @@ -22,6 +22,10 @@ FluTextBox{ id:control_popup y:control.height focus: false +// modal: true +// Overlay.modal: Item{} + + padding: 0 enter: Transition { NumberAnimation { property: "opacity" @@ -30,15 +34,12 @@ FluTextBox{ duration: FluTheme.enableAnimation ? 83 : 0 } } - background: FluRectangle{ - id:container - width: control.width + contentItem: FluRectangle{ radius: [4,4,4,4] FluShadow{ radius: 4 } color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1) - height: 38*Math.min(Math.max(list_view.count,1),8) ListView{ id:list_view anchors.fill: parent @@ -86,6 +87,11 @@ FluTextBox{ } } } + background: Item{ + id:container + implicitWidth: control.width + implicitHeight: 38*Math.min(Math.max(list_view.count,1),8) + } } onTextChanged: { loadData() diff --git a/src/imports/FluentUI/Controls/FluDropDownButton.qml b/src/imports/FluentUI/Controls/FluDropDownButton.qml index 57ace0e3..50b8fb94 100644 --- a/src/imports/FluentUI/Controls/FluDropDownButton.qml +++ b/src/imports/FluentUI/Controls/FluDropDownButton.qml @@ -75,7 +75,7 @@ Button { color: control.textColor } onClicked: { - if(items && menu.count !==0){ + if(menu.count !==0){ var pos = control.mapToItem(null, 0, 0) var containerHeight = menu.count*36 if(window.height>pos.y+control.height+containerHeight){ diff --git a/src/imports/FluentUI/Controls/FluScrollBar.qml b/src/imports/FluentUI/Controls/FluScrollBar.qml index c8007a84..1c088693 100644 --- a/src/imports/FluentUI/Controls/FluScrollBar.qml +++ b/src/imports/FluentUI/Controls/FluScrollBar.qml @@ -74,14 +74,11 @@ T.ScrollBar { } ,Transition { to: "show" - SequentialAnimation{ - PauseAnimation { duration: 100 } - NumberAnimation { - target: rect_bar - properties: vertical ? "width" : "height" - duration: 167 - easing.type: Easing.OutCubic - } + NumberAnimation { + target: rect_bar + properties: vertical ? "width" : "height" + duration: 167 + easing.type: Easing.OutCubic } } ]