From 97a147ae66c7a7bb9d7b6b623eecb48befc1a6bf Mon Sep 17 00:00:00 2001 From: lexiaoyao2 Date: Sat, 16 Aug 2025 19:04:31 +0800 Subject: [PATCH] add blurStyle and effect option for time/date picker Signed-off-by: lexiaoyao2 Change-Id: Ibf85edb1763d21a20626e0f478c98bc08be20465 --- .../native/implementation/date_picker_dialog_accessor.cpp | 2 ++ .../native/implementation/time_picker_dialog_accessor.cpp | 2 ++ frameworks/core/interfaces/native/utility/converter.cpp | 3 +++ 3 files changed, 7 insertions(+) diff --git a/frameworks/core/interfaces/native/implementation/date_picker_dialog_accessor.cpp b/frameworks/core/interfaces/native/implementation/date_picker_dialog_accessor.cpp index 4611c72a491..fc2b012dc48 100644 --- a/frameworks/core/interfaces/native/implementation/date_picker_dialog_accessor.cpp +++ b/frameworks/core/interfaces/native/implementation/date_picker_dialog_accessor.cpp @@ -66,6 +66,8 @@ PickerDialogInfo BuildDatePickerDialogInfo(const Ark_DatePickerDialogOptions& op } dialogInfo.backgroundBlurStyle = static_cast(Converter::OptConvert( options.backgroundBlurStyle).value_or(BlurStyle::COMPONENT_REGULAR)); + dialogInfo.blurStyleOption = Converter::OptConvert(options.backgroundBlurStyleOptions); + dialogInfo.effectOption = Converter::OptConvert(options.backgroundEffect); dialogInfo.backgroundColor = Converter::OptConvert(options.backgroundColor); dialogInfo.shadow = Converter::OptConvert(options.shadow); dialogInfo.maskRect = Converter::OptConvert(options.maskRect); diff --git a/frameworks/core/interfaces/native/implementation/time_picker_dialog_accessor.cpp b/frameworks/core/interfaces/native/implementation/time_picker_dialog_accessor.cpp index 34ccae329ca..a4388e28c04 100644 --- a/frameworks/core/interfaces/native/implementation/time_picker_dialog_accessor.cpp +++ b/frameworks/core/interfaces/native/implementation/time_picker_dialog_accessor.cpp @@ -61,6 +61,8 @@ PickerDialogInfo BuildTimePickerDialogInfo(const Ark_TimePickerDialogOptions& op } dialogInfo.backgroundBlurStyle = static_cast(Converter::OptConvert( options.backgroundBlurStyle).value_or(BlurStyle::COMPONENT_REGULAR)); + dialogInfo.blurStyleOption = Converter::OptConvert(options.backgroundBlurStyleOptions); + dialogInfo.effectOption = Converter::OptConvert(options.backgroundEffect); dialogInfo.backgroundColor = Converter::OptConvert(options.backgroundColor); dialogInfo.shadow = Converter::OptConvert(options.shadow); auto enableHoverMode = Converter::OptConvert(options.enableHoverMode); diff --git a/frameworks/core/interfaces/native/utility/converter.cpp b/frameworks/core/interfaces/native/utility/converter.cpp index 46fc401da45..ebba4efe702 100644 --- a/frameworks/core/interfaces/native/utility/converter.cpp +++ b/frameworks/core/interfaces/native/utility/converter.cpp @@ -2106,6 +2106,9 @@ template<> DimensionRect Convert(const Ark_Rectangle &src) { DimensionRect dst; + dst.SetOffset(DimensionOffset(CalcDimension(0, DimensionUnit::VP), CalcDimension(0, DimensionUnit::VP))); + dst.SetSize(DimensionSize(CalcDimension(1, DimensionUnit::PERCENT), CalcDimension(1, DimensionUnit::PERCENT))); + if (auto dim = OptConvert(src.width); dim) { if (dim.has_value()) { if (dim.value().IsNegative()) { -- Gitee