From b70a982586e9e9efcfa2900ecf996bcc4100d71c Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Tue, 28 Mar 2023 18:14:14 +0800 Subject: [PATCH] update --- example/page/AboutPage.qml | 2 +- src/controls/FluAutoSuggestBox.qml | 10 ++++++++++ src/controls/FluCalendarPicker.qml | 8 ++++++++ src/controls/FluColorPicker.qml | 8 ++++++++ src/controls/FluDatePicker.qml | 8 ++++++++ src/controls/FluDropDownButton.qml | 2 +- src/controls/FluMenu.qml | 9 +++++++++ src/controls/FluTimePicker.qml | 8 ++++++++ 8 files changed, 53 insertions(+), 2 deletions(-) diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 9b23f2ee..5c2d9704 100644 --- a/example/page/AboutPage.qml +++ b/example/page/AboutPage.qml @@ -35,7 +35,7 @@ FluWindow { fontStyle: FluText.Title } FluText{ - text:"v1.1.4" + text:"v1.1.5" fontStyle: FluText.Body Layout.alignment: Qt.AlignBottom } diff --git a/src/controls/FluAutoSuggestBox.qml b/src/controls/FluAutoSuggestBox.qml index e73ce6ad..54cc67e4 100644 --- a/src/controls/FluAutoSuggestBox.qml +++ b/src/controls/FluAutoSuggestBox.qml @@ -139,6 +139,16 @@ TextField{ id:input_popup visible: input.focus y:input.height + modal: true + dim:false + enter: Transition { + NumberAnimation { + property: "y" + from:0 + to:input_popup.y + duration: 150 + } + } onClosed: { input.focus = false } diff --git a/src/controls/FluCalendarPicker.qml b/src/controls/FluCalendarPicker.qml index f8b970bd..631eb8fd 100644 --- a/src/controls/FluCalendarPicker.qml +++ b/src/controls/FluCalendarPicker.qml @@ -65,6 +65,14 @@ Rectangle { width: container.width modal: true dim:false + enter: Transition { + NumberAnimation { + property: "y" + from:0 + to:popup.y + duration: 150 + } + } background: FluCalendarView{ id:container onDateClicked: diff --git a/src/controls/FluColorPicker.qml b/src/controls/FluColorPicker.qml index 748dd452..5e3a646c 100644 --- a/src/controls/FluColorPicker.qml +++ b/src/controls/FluColorPicker.qml @@ -36,6 +36,14 @@ Button{ background: FluColorView{ id:container } + enter: Transition { + NumberAnimation { + property: "y" + from:0 + to:popup.y + duration: 150 + } + } contentItem: Item{} function showPopup() { var pos = control.mapToItem(null, 0, 0) diff --git a/src/controls/FluDatePicker.qml b/src/controls/FluDatePicker.qml index 6d254578..fee4cdb0 100644 --- a/src/controls/FluDatePicker.qml +++ b/src/controls/FluDatePicker.qml @@ -104,6 +104,14 @@ Rectangle { contentItem: Item{} modal: true dim:false + enter: Transition { + NumberAnimation { + property: "y" + from:0 + to:popup.y + duration: 150 + } + } background: Rectangle{ id:container width: 300 diff --git a/src/controls/FluDropDownButton.qml b/src/controls/FluDropDownButton.qml index c1bea652..ad636f3a 100644 --- a/src/controls/FluDropDownButton.qml +++ b/src/controls/FluDropDownButton.qml @@ -75,7 +75,7 @@ Button { }else if(pos.y>menu.height){ menu.y = -menu.height }else{ - popup.y = window.height-(pos.y+menu.height) + menu.y = window.height-(pos.y+menu.height) } menu.open() } diff --git a/src/controls/FluMenu.qml b/src/controls/FluMenu.qml index 8ac9442d..2565ce9c 100644 --- a/src/controls/FluMenu.qml +++ b/src/controls/FluMenu.qml @@ -13,6 +13,15 @@ Menu { dim:false contentItem: Item{} + enter: Transition { + NumberAnimation { + property: "y" + from:0 + to:popup.y + duration: 150 + } + } + background: Item { Rectangle{ anchors.fill: parent diff --git a/src/controls/FluTimePicker.qml b/src/controls/FluTimePicker.qml index aaac88f0..37517dae 100644 --- a/src/controls/FluTimePicker.qml +++ b/src/controls/FluTimePicker.qml @@ -106,6 +106,14 @@ Rectangle { contentItem: Item{} modal: true dim:false + enter: Transition { + NumberAnimation { + property: "y" + from:0 + to:popup.y + duration: 150 + } + } background: Rectangle{ id:container width: 300