From 79ad3534c4a6ec142b919b9ba9e61859a2c39eee Mon Sep 17 00:00:00 2001 From: kangpeng Date: Sun, 24 Aug 2025 10:44:39 +0800 Subject: [PATCH] =?UTF-8?q?[tv][popup]=E8=AE=BE=E8=AE=A1=E6=96=B0=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kangpeng --- .../resources/base/element/float_sys.json | 8 + .../resources/base/element/id_defined.json | 6 +- .../main/resources/base/element/pattern.json | 4 +- .../main/resources/tv/element/color_sys.json | 6 +- .../main/resources/tv/element/float.json | 2 +- .../main/resources/tv/element/float_sys.json | 12 +- .../main/resources/tv/element/pattern.json | 217 ------------------ 7 files changed, 26 insertions(+), 229 deletions(-) diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index 51ee331c..36881abd 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -596,6 +596,14 @@ "name": "popup_container_theme_color_mode", "value": "0.0" }, + { + "name": "popup_arrow_height", + "value": "8.0vp" + }, + { + "name": "popup_arrow_width", + "value": "16.0vp" + }, { "name": "checkbox_round_container_focus_size", "value": "2.0vp" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index e6acce37..34216bca 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -32995,14 +32995,12 @@ { "type": "float", "name": "popup_arrow_height", - "order": 6546, - "flags": "private" + "order": 6546 }, { "type": "float", "name": "popup_arrow_width", - "order": 6547, - "flags": "private" + "order": 6547 }, { "type": "float", diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 6af74d77..459ab496 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -3709,11 +3709,11 @@ }, { "name": "popup_arrow_height", - "value": "8.0vp" + "value": "$float:popup_arrow_height" }, { "name": "popup_arrow_width", - "value": "16.0vp" + "value": "$float:popup_arrow_width" } ] }, diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index 4eb0037a..149dc460 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -22,7 +22,7 @@ }, { "name": "interactive_hover", - "value": "#4DFFFFFF" + "value": "#19FFFFFF" }, { "name": "interactive_pressed", @@ -54,11 +54,11 @@ }, { "name": "popup_border_color", - "value": "#1AFFFFFF" + "value": "#26FFFFFF" }, { "name": "popup_text_primary_color", - "value": "#dbffffff" + "value": "#E6FFFFFF" }, { "name": "dataPanel_color_subheading_separator", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 8fd1c545..3e52550b 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -286,7 +286,7 @@ }, { "name": "ohos_id_toast_content_limit_max_width", - "value": "568.0vp" + "value": "570.0vp" }, { "name": "toast_default_shadow_style", diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index 049a040e..80823d3e 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -110,7 +110,7 @@ }, { "name": "popup_border_width", - "value": "0.0vp" + "value": "1.0vp" }, { "name": "popup_target_space", @@ -138,7 +138,7 @@ }, { "name": "popup_vertical_padding", - "value": "17.0vp" + "value": "16.0vp" }, { "name": "popup_text_font_size", @@ -148,6 +148,14 @@ "name": "popup_container_theme_color_mode", "value": "0.0" }, + { + "name": "popup_arrow_height", + "value": "12.0vp" + }, + { + "name": "popup_arrow_width", + "value": "22.0vp" + }, { "name": "image_animator_corner_radius_card", "value": "12.0vp" diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json index 037c8915..7ccad721 100644 --- a/systemres/main/resources/tv/element/pattern.json +++ b/systemres/main/resources/tv/element/pattern.json @@ -1024,223 +1024,6 @@ } ] }, - { - "name": "ohos_popup_pattern", - "value": [ - { - "name": "bg_color", - "value": "$color:ohos_id_color_help_tip_bg" - }, - { - "name": "text_font_size", - "value": "$float:popup_text_font_size" - }, - { - "name": "text_color", - "value": "#e6000000" - }, - { - "name": "popup_default_bg_color", - "value": "$color:popup_container_default_color" - }, - { - "name": "popup_bg_theme_color_mode", - "value": "$float:popup_container_theme_color_mode" - }, - { - "name": "popup_border_color", - "value": "$color:popup_border_color" - }, - { - "name": "popup_border_width", - "value": "$float:popup_border_width" - }, - { - "name": "popup_target_space", - "value": "$float:popup_target_space" - }, - { - "name": "popup_corner_radius", - "value": "$float:popup_corner_radius" - }, - { - "name": "popup_min_height", - "value": "$float:popup_min_height" - }, - { - "name": "bubble_min_mum_height", - "value": "$float:bubble_min_mum_height" - }, - { - "name": "popup_max_columns", - "value": "$float:popup_max_columns" - }, - { - "name": "popup_button_text_font_size", - "value": "$float:ohos_id_text_size_button2" - }, - { - "name": "popup_border_radius", - "value": "$float:popup_corner_radius" - }, - { - "name": "popup_horizontal_padding", - "value": "$float:popup_horizontal_padding" - }, - { - "name": "popup_vertical_padding", - "value": "$float:popup_vertical_padding" - }, - { - "name": "bg_color_hovered", - "value": "$color:ohos_id_color_hover_transparent" - }, - { - "name": "bg_color_pressed", - "value": "$color:ohos_id_color_click_effect_transparent" - }, - { - "name": "bg_color_focused", - "value": "$color:ohos_id_color_focused_outline_transparent" - }, - { - "name": "popup_mask_color", - "value": "$color:ohos_id_popup_mask_color" - }, - { - "name": "popup_text_color", - "value": "$color:ohos_id_popup_text_color" - }, - { - "name": "popup_text_font_size", - "value": "$float:ohos_id_popup_text_font_size" - }, - { - "name": "popup_double_border_enable", - "value": "$string:ohos_id_popup_double_border_enable_default" - }, - { - "name": "popup_outer_border_color", - "value": "$color:ohos_id_popup_outer_border_color" - }, - { - "name": "popup_outer_border_width", - "value": "$float:popup_outer_border_width" - }, - { - "name": "popup_inner_border_color", - "value": "$color:ohos_id_popup_inner_border_color" - }, - { - "name": "popup_inner_border_width", - "value": "$float:popup_inner_border_width" - }, - { - "name": "tips_double_border_enable", - "value": "$string:tips_double_border_enable_default" - }, - { - "name": "tips_outer_border_color", - "value": "$color:tips_outer_border_color" - }, - { - "name": "tips_outer_border_color_dark", - "value": "$color:tips_outer_border_color_dark" - }, - { - "name": "tips_outer_border_width", - "value": "$float:tips_outer_border_width" - }, - { - "name": "tips_inner_border_color", - "value": "$color:tips_inner_border_color" - }, - { - "name": "tips_inner_border_width", - "value": "$float:tips_inner_border_width" - }, - { - "name": "text_primary_color", - "value": "$color:popup_text_primary_color" - }, - { - "name": "text_primary_activated_color", - "value": "$color:ohos_id_color_text_primary_activated" - }, - { - "name": "text_secondary_color", - "value": "$color:ohos_id_color_secondary" - }, - { - "name": "popup_expand_display", - "value": "$string:ohos_id_expand_display" - }, - { - "name": "popup_default_shadow_style", - "value": "$float:popup_default_shadow_style" - }, - { - "name": "popup_background_blur_style", - "value": "$float:popup_background_blur_style" - }, - { - "name": "popup_button_type", - "value": "$float:popup_button_type" - }, - { - "name": "popup_primary_button_background_color", - "value": "$color:popup_primary_button_background_color_sys" - }, - { - "name": "popup_secondary_button_background_color", - "value": "$color:popup_secondary_button_background_color_sys" - }, - { - "name": "popup_primary_button_font_color", - "value": "$color:popup_primary_button_font_color_sys" - }, - { - "name": "popup_secondary_button_font_color", - "value": "$color:popup_secondary_button_font_color_sys" - }, - { - "name": "popup_button_space", - "value": "$float:popup_button_space_sys" - }, - { - "name": "popup_button_left_margin", - "value": "$float:popup_button_left_margin_sys" - }, - { - "name": "popup_button_top_margin", - "value": "$float:popup_button_top_margin_sys" - }, - { - "name": "popup_button_bottom_margin", - "value": "$float:popup_button_bottom_margin_sys" - }, - { - "name": "popup_button_height", - "value": "$float:popup_button_height_sys" - }, - { - "name": "popup_button_text_font_weight", - "value": "$float:popup_button_text_font_weight_sys" - }, - { - "name": "popup_double_button_is_same_style", - "value": "$float:popup_double_button_is_same_style_sys" - }, - { - "name": "popup_arrow_height", - "value": "10.0vp" - }, - { - "name": "popup_arrow_width", - "value": "22.0vp" - } - ] - }, { "name": "ohos_swiper_pattern", "value": [ -- Gitee