From 2818b84860697f60bf1cf49f58cba7ff0dc6070e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Thu, 24 Aug 2023 22:04:51 +0800 Subject: [PATCH] update --- src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml | 8 +++++--- src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml index c386c9bd..8ca2a083 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml @@ -114,9 +114,11 @@ Rectangle { } } function showPopup() { - container.currentDate = current - container.date = current - container.updateMouth(current) + if(current){ + container.currentDate = current + container.date = current + container.updateMouth(current) + } var pos = control.mapToItem(null, 0, 0) if(d.window.height>pos.y+control.height+container.height){ popup.y = control.height diff --git a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml index 00c7c173..9e00174c 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml @@ -114,9 +114,11 @@ Rectangle { } } function showPopup() { - container.currentDate = current - container.date = current - container.updateMouth(current) + if(current){ + container.currentDate = current + container.date = current + container.updateMouth(current) + } var pos = control.mapToItem(null, 0, 0) if(d.window.height>pos.y+control.height+container.height){ popup.y = control.height