From 702ee255f3c3c9aa15c16880d09d6a86af204c35 Mon Sep 17 00:00:00 2001 From: xdongs Date: Thu, 5 Dec 2024 10:57:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=20=EF=BC=88cherry=20picked=20commit=20from?= =?UTF-8?q?=20=20signed-off-by:=20xdongs=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/ets/common/constant.ets | 2 +- .../entry/src/main/ets/pages/notificationDialog.ets | 3 ++- .../entry/src/main/ets/pages/pcNotificationDialog.ets | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/common/constant.ets b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/common/constant.ets index 5bdf485fe..103426d75 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/common/constant.ets +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/common/constant.ets @@ -147,7 +147,7 @@ export default class Constants { public static CROSS_LINE_RESIZE_PARAM = 1.25; public static FONT_SCALE_DEFAULT = 1; - public static FONT_SCALE_MAX = 2; + public static FONT_SCALE_MAX = 1.8; public static MAX_DIALOG_WIDTH = 400; //pc diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/notificationDialog.ets b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/notificationDialog.ets index fc99751e7..bdc6bd9bc 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/notificationDialog.ets +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/notificationDialog.ets @@ -138,7 +138,8 @@ struct PermissionDialog { let containerWidth = newValue.width as number; let options: MeasureOptions = { textContent: $r('app.string.group_label_notification', this.appName), - fontSize: $r('sys.float.ohos_id_text_size_headline8'), + fontSize: getLimitFontSize(sourceToVp($r('sys.float.ohos_id_text_size_headline8')), + getFontSizeScale(getContext(this) as common.UIAbilityContext, Constants.FONT_SCALE_MAX)), fontWeight: FontWeight.Bold, }; this.titleContainerWidth = calContainerWidth(containerWidth, options, diff --git a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/pcNotificationDialog.ets b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/pcNotificationDialog.ets index 1ae25afdd..2e9c3e103 100644 --- a/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/pcNotificationDialog.ets +++ b/services/dialog_ui/enable_notification_dialog/entry/src/main/ets/pages/pcNotificationDialog.ets @@ -150,7 +150,8 @@ struct PermissionDialog { let containerWidth = newValue.width as number; let options: MeasureOptions = { textContent: $r('app.string.group_label_notification', this.appName), - fontSize: $r('sys.float.Title_S'), + fontSize: getLimitFontSize(sourceToVp($r('sys.float.Title_S')), + getFontSizeScale(getContext(this) as common.UIAbilityContext, Constants.FONT_SCALE_MAX)), fontWeight: FontWeight.Bold, }; this.titleContainerWidth = calContainerWidth(containerWidth, options, -- Gitee