From 4d94e8054770d542116becadf24ebcd79c36b5f0 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Thu, 4 Sep 2025 15:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90select=E4=B8=8B=E6=8B=89=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E3=80=91=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=94=AF=E6=8C=81=E4=BA=A7=E5=93=81=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhanghang --- .../resources/base/element/float_sys.json | 12 + .../resources/base/element/id_defined.json | 20 + .../main/resources/base/element/pattern.json | 16 +- .../main/resources/tv-dark/element/color.json | 2 +- .../main/resources/tv/element/color.json | 2 +- .../main/resources/tv/element/color_sys.json | 84 +++ .../main/resources/tv/element/float.json | 2 +- .../main/resources/tv/element/float_sys.json | 176 +++++ .../main/resources/tv/element/pattern.json | 633 ------------------ 9 files changed, 307 insertions(+), 640 deletions(-) diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index 4a689910..138b0d4b 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -1456,6 +1456,18 @@ "name": "select_slide_more_offset", "value": "0" }, + { + "name": "menu_icon_padding", + "value": "16.0vp" + }, + { + "name": "menu_icon_side_length", + "value": "24.0vp" + }, + { + "name": "menu_title_text_font_size", + "value": "20.0vp" + }, { "name": "textfield_independent_control_keyboard", "value": "0.0" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 63223f93..d6372c88 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -33322,6 +33322,26 @@ "name": "textfield_cursor_height", "order": 6608, "flags": "private" + }, + { + "type": "float", + "name": "menu_icon_side_length", + "order": 6609 + }, + { + "type": "float", + "name": "menu_min_width", + "order": 6610 + }, + { + "type": "float", + "name": "menu_title_text_font_size", + "order": 6611 + }, + { + "type": "float", + "name": "menu_icon_padding", + "order": 6612 } ] } diff --git a/systemres/main/resources/base/element/pattern.json b/systemres/main/resources/base/element/pattern.json index 22ca2074..77598a8a 100644 --- a/systemres/main/resources/base/element/pattern.json +++ b/systemres/main/resources/base/element/pattern.json @@ -6396,7 +6396,7 @@ }, { "name": "menu_title_text_font_size", - "value": "$float:ohos_id_text_size_headline8" + "value": "$float:menu_title_text_font_size" }, { "name": "border_radius", @@ -6432,7 +6432,7 @@ }, { "name": "select_check_mark_font_size", - "value": "24.0vp" + "value": "$float:menu_icon_side_length" }, { "name": "focus_bg_outline_color", @@ -6460,7 +6460,7 @@ }, { "name": "menu_icon_padding", - "value": "$float:ohos_id_text_paragraph_margin_m" + "value": "$float:menu_icon_padding" }, { "name": "icon_content_padding", @@ -6540,7 +6540,15 @@ }, { "name": "icon_side_length", - "value": "24.0vp" + "value": "$float:menu_icon_side_length" + }, + { + "name": "menu_min_width", + "value": "$float:menu_min_width" + }, + { + "name": "menu_default_width", + "value": "$float:menu_min_width" }, { "name": "content_margin", diff --git a/systemres/main/resources/tv-dark/element/color.json b/systemres/main/resources/tv-dark/element/color.json index c9667012..eb02f03a 100644 --- a/systemres/main/resources/tv-dark/element/color.json +++ b/systemres/main/resources/tv-dark/element/color.json @@ -10,7 +10,7 @@ }, { "name": "ohos_id_color_primary", - "value": "#E6FFFFFF" + "value": "#99FFFFFF" }, { "name": "ohos_id_color_tertiary", diff --git a/systemres/main/resources/tv/element/color.json b/systemres/main/resources/tv/element/color.json index fff26fe1..b346bbd5 100644 --- a/systemres/main/resources/tv/element/color.json +++ b/systemres/main/resources/tv/element/color.json @@ -50,7 +50,7 @@ }, { "name": "ohos_id_color_list_separator", - "value": "#33F1F3F5" + "value": "#33FFFFFF" }, { "name": "comp_divider", diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index 488a878d..c051254b 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -104,6 +104,90 @@ "name": "textfield_bg_color", "value": "$color:comp_background_tertiary" }, + { + "name": "menu_text_normal_color", + "value": "#E5FFFFFF" + }, + { + "name": "select_menu_container_normal_color", + "value": "#E62E3033" + }, + { + "name": "select_option_hovered_bg_color", + "value": "#4DFFFFFF" + }, + { + "name": "ohos_id_picker_press_color", + "value": "#26FFFFFF" + }, + { + "name": "select_option_clicked_bg_color", + "value": "#26FFFFFF" + }, + { + "name": "select_bg_color_selected", + "value": "#33f1f3f5" + }, + { + "name": "text_color_selected", + "value": "#E6FFFFFF" + }, + { + "name": "menu_back_blur_color", + "value": "#CC000000" + }, + { + "name": "menu_border_color", + "value": "#26FFFFFF" + }, + { + "name": "menu_item_focused_bg_color", + "value": "#4DFFFFFF" + }, + { + "name": "menu_item_focused_text_color", + "value": "#e5ffffff" + }, + { + "name": "select_font_color", + "value": "#E6FFFFFF" + }, + { + "name": "select_selected_color", + "value": "#4DFFFFFF" + }, + { + "name": "select_border_normal_color", + "value": "#26FFFFFF" + }, + { + "name": "select_text_focus_color", + "value": "#e5ffffff" + }, + { + "name": "select_container_focus_color", + "value": "#7FFFFFFF" + }, + { + "name": "menu_normal_border_color", + "value": "#1AFFFFFF" + }, + { + "name": "select_option_container_focus_color", + "value": "#7FFFFFFF" + }, + { + "name": "select_option_focus_font_color", + "value": "#e5ffffff" + }, + { + "name": "select_option_border_selected_color", + "value": "#CCFFFFFF" + }, + { + "name": "select_focus_icon_color", + "value": "#e5ffffff" + }, { "name": "searchkeyboard_primary_control_color", "value": "#E6000000" diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index 8d502f75..d10f17a3 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -134,7 +134,7 @@ }, { "name": "ohos_id_corner_radius_card", - "value": "12.0vp" + "value": "32.0vp" }, { "name": "ohos_id_corner_radius_progress_bar", diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index c7b7a04c..d41c774c 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -872,6 +872,182 @@ "name": "app_theme_drag_distancethreshold", "value": "20.0vp" }, + { + "name": "menu_item_child_min_height_token", + "value": "64.0vp" + }, + { + "name": "inner_border_radius_token", + "value": "12.0vp" + }, + { + "name": "ohos_id_alpha_highlight_bg", + "value": "1.0" + }, + { + "name": "select_normal_content_margin", + "value": "12.0vp" + }, + { + "name": "menu_icon_side_length", + "value": "32.0vp" + }, + { + "name": "menu_border_width", + "value": "1.0vp" + }, + { + "name": "menu_item_left_right_margin", + "value": "1.0vp" + }, + { + "name": "menu_target_security_space", + "value": "16.0vp" + }, + { + "name": "menu_item_focused_shadow_style", + "value": "2.0" + }, + { + "name": "option_min_height", + "value": "56.0vp" + }, + { + "name": "menu_title_text_font_size", + "value": "26.0fp" + }, + { + "name": "menu_normal_out_padding", + "value": "10.0vp" + }, + { + "name": "menu_icon_padding", + "value": "26.0vp" + }, + { + "name": "ohos_id_text_paragraph_margin_s", + "value": "10.0vp" + }, + { + "name": "ohos_id_menu_outer_border_width", + "value": "0.0vp" + }, + { + "name": "ohos_id_menu_inner_border_width", + "value": "0.0vp" + }, + { + "name": "menu_item_need_focus", + "value": "1" + }, + { + "name": "menu_default_show_divider", + "value": "1" + }, + { + "name": "menu_divider_start_margin", + "value": "16.0vp" + }, + { + "name": "menu_divider_end_margin", + "value": "16.0vp" + }, + { + "name": "menu_focus_style_type", + "value": "1.0" + }, + { + "name": "select_focus_style_type", + "value": "1.0" + }, + { + "name": "option_focus_style_type_sys", + "value": "1.0" + }, + { + "name": "select_border_width", + "value": "0.5vp" + }, + { + "name": "select_normal_shadow", + "value": "1.0" + }, + { + "name": "select_focus_shadow", + "value": "5.0" + }, + { + "name": "menu_back_blur_with_color", + "value": "1.0" + }, + { + "name": "select_focus_scale", + "value": "1.05" + }, + { + "name": "select_option_normal_top_bottom_margin", + "value": "6.0vp" + }, + { + "name": "select_option_content_normal_align", + "value": "1.0" + }, + { + "name": "select_option_focus_left_right_margin", + "value": "6.0vp" + }, + { + "name": "select_option_focus_shadow", + "value": "2.0" + }, + { + "name": "select_option_border_selected_width", + "value": "2.0vp" + }, + { + "name": "select_left_right_margin", + "value": "0.0vp" + }, + { + "name": "menu_is_blend_bg_color", + "value": "1" + }, + { + "name": "select_option_focus_box_padding", + "value": "2.0vp" + }, + { + "name": "select_option_apply_focus_style", + "value": "1" + }, + { + "name": "select_option_content_normal_left_right_padding", + "value": "10.0vp" + }, + { + "name": "menu_normal_text_size", + "value": "24.0fp" + }, + { + "name": "background_blur_component_regular", + "value": "12.0" + }, + { + "name": "menu_default_shadow_style", + "value": "4" + }, + { + "name": "menu_item_hor_interval", + "value": "16.0vp" + }, + { + "name": "menu_padding_interval", + "value": "16.0vp" + }, + { + "name": "menu_min_width", + "value": "368.0vp" + }, { "name": "alpha_primary", "value": "0.9" diff --git a/systemres/main/resources/tv/element/pattern.json b/systemres/main/resources/tv/element/pattern.json index e710c643..121c9d6e 100644 --- a/systemres/main/resources/tv/element/pattern.json +++ b/systemres/main/resources/tv/element/pattern.json @@ -1851,639 +1851,6 @@ } ] }, - { - "name": "ohos_select_pattern", - "value": [ - { - "name": "bg_color", - "value": "#E62E3033" - }, - { - "name": "bg_color_select_button", - "value": "$color:select_normal_bg_color" - }, - { - "name": "bg_color_hovered", - "value": "#4dffffff" - }, - { - "name": "bg_color_clicked", - "value": "#26FFFFFF" - }, - { - "name": "bg_color_selected", - "value": "#33f1f3f5" - }, - { - "name": "text_color", - "value": "$color:menu_text_normal_color" - }, - { - "name": "text_color_selected", - "value": "#E6FFFFFF" - }, - { - "name": "line_color", - "value": "$color:ohos_id_color_list_separator" - }, - { - "name": "text_font_size", - "value": "$float:select_normal_text_font_size" - }, - { - "name": "small_text_font_size", - "value": "$float:ohos_id_text_size_body2" - }, - { - "name": "menu_back_blur_with_color", - "value": "1.0" - }, - { - "name": "menu_back_blur_color", - "value": "#CC000000" - }, - { - "name": "menu_border_width", - "value": "1.0vp" - }, - { - "name": "menu_border_color", - "value": "#26FFFFFF" - }, - { - "name": "menu_item_top_bottom_margin", - "value": "$float:menu_item_top_bottom_margin" - }, - { - "name": "menu_item_left_right_margin", - "value": "1.0vp" - }, - { - "name": "menu_target_security_space", - "value": "16.0vp" - }, - { - "name": "menu_item_content_align", - "value": "4.0" - }, - { - "name": "menu_item_focused_bg_color", - "value": "#4DFFFFFF" - }, - { - "name": "menu_item_focused_text_color", - "value": "#e5ffffff" - }, - { - "name": "menu_item_focused_shadow_style", - "value": "2.0" - }, - { - "name": "menu_text_font_size", - "value": "24.0fp" - }, - { - "name": "menu_title_text_font_size", - "value": "26.0fp" - }, - { - "name": "border_radius", - "value": "20.0vp" - }, - { - "name": "menu_border_radius", - "value": "32.0vp" - }, - { - "name": "inner_border_radius", - "value": "12.0vp" - }, - { - "name": "menu_icon_color", - "value": "$color:ohos_id_color_primary" - }, - { - "name": "select_icon_color", - "value": "$color:select_normal_icon_color" - }, - { - "name": "select_symbol_color", - "value": "#E6FFFFFF" - }, - { - "name": "focus_bg_outline_color", - "value": "$color:ohos_id_color_activated" - }, - { - "name": "text_color_disabled_alpha", - "value": "$float:ohos_id_alpha_disabled" - }, - { - "name": "menu_text_color_disabled", - "value": "$color:ohos_id_color_text_tertiary" - }, - { - "name": "menu_text_tertiary_alpha", - "value": "$float:menu_text_tertiary_alpha" - }, - { - "name": "menu_text_primary_alpha", - "value": "0.9" - }, - { - "name": "menu_text_secondary_alpha", - "value": "$float:ohos_id_alpha_content_secondary" - }, - { - "name": "menu_icon_padding", - "value": "26.0vp" - }, - { - "name": "icon_content_padding", - "value": "10.0vp" - }, - { - "name": "divider_padding_vertical", - "value": "4.0vp" - }, - { - "name": "divider_padding_horizontal", - "value": "16.0vp" - }, - { - "name": "color_disabled_alpha", - "value": "$float:select_disabled_color_alpha" - }, - { - "name": "select_menu_padding", - "value": "4.0vp" - }, - { - "name": "option_min_height", - "value": "56.0vp" - }, - { - "name": "out_padding", - "value": "10.0vp" - }, - { - "name": "content_spinner_padding", - "value": "8.0vp" - }, - { - "name": "menu_animation_offset", - "value": "30.0px" - }, - { - "name": "spinner_width", - "value": "12.0vp" - }, - { - "name": "small_spinner_width", - "value": "10.0vp" - }, - { - "name": "spinner_height", - "value": "24.0vp" - }, - { - "name": "small_spinner_height", - "value": "20.0vp" - }, - { - "name": "default_divider_width", - "value": "1.0vp" - }, - { - "name": "select_min_width", - "value": "66.0vp" - }, - { - "name": "normal_select_min_width", - "value": "68.0vp" - }, - { - "name": "small_select_min_width", - "value": "56.0vp" - }, - { - "name": "select_min_height", - "value": "40.0vp" - }, - { - "name": "small_select_min_height", - "value": "28.0vp" - }, - { - "name": "icon_side_length", - "value": "24.0vp" - }, - { - "name": "content_margin", - "value": "12.0vp" - }, - { - "name": "menu_title_height", - "value": "64.0vp" - }, - { - "name": "default_padding_start", - "value": "12.0vp" - }, - { - "name": "default_padding_end", - "value": "12.0vp" - }, - { - "name": "default_padding_top", - "value": "12.0vp" - }, - { - "name": "default_padding_bottom_fixed", - "value": "24.0vp" - }, - { - "name": "bg_color_selected_alpha", - "value": "1.0" - }, - { - "name": "preview_menu_mask_color", - "value": "$color:ohos_id_color_mask_thin" - }, - { - "name": "menu_bg_color_alpha", - "value": "0.85" - }, - { - "name": "select_color_text_primary", - "value": "$color:ohos_id_select_color_text_primary" - }, - { - "name": "select_clicked_color", - "value": "$color:ohos_id_picker_press_color" - }, - { - "name": "select_selected_color", - "value": "#33f1f3f5" - }, - { - "name": "select_font_color", - "value": "$color:select_normal_font_color" - }, - { - "name": "select_option_show_count", - "value": "INT32_MAX" - }, - { - "name": "select_itself_rrect_size", - "value": "8.0vp" - }, - { - "name": "select_popup_border_width", - "value": "2.0vp" - }, - { - "name": "select_popup_shadow_width", - "value": "60.0vp" - }, - { - "name": "select_popup_rrect_size", - "value": "16.0vp" - }, - { - "name": "select_popup_min_width", - "value": "136.0vp" - }, - { - "name": "select_normal_padding", - "value": "16.0vp" - }, - { - "name": "select_itself_icon_size", - "value": "8.0vp" - }, - { - "name": "select_is_tv", - "value": "$float:ohos_id_select_is_tv" - }, - { - "name": "select_popup_spacing_horizontal", - "value": "24.0vp" - }, - { - "name": "select_popup_spacing_vertical", - "value": "27.0vp" - }, - { - "name": "select_popup_spacing_content", - "value": "$float:ohos_id_select_popup_spacing_content" - }, - { - "name": "text_size_headline7", - "value": "30.0vp" - }, - { - "name": "text_font_family_regular", - "value": "$string:ohos_id_text_font_family_regular" - }, - { - "name": "select_option_disable_color", - "value": "$color:ohos_id_select_option_disable_color" - }, - { - "name": "select_option_focused_disable_color", - "value": "$color:ohos_id_select_option_focused_disable_color" - }, - { - "name": "select_option_focused_disable_text_color", - "value": "$color:ohos_id_select_option_focused_disable_text_color" - }, - { - "name": "select_default_border_radius", - "value": "20.0vp" - }, - { - "name": "small_select_border_radius", - "value": "14.0vp" - }, - { - "name": "select_default_bg_color", - "value": "#3C3C3C" - }, - { - "name": "menu_expand_display", - "value": "$string:ohos_id_expand_display" - }, - { - "name": "max_padding_start", - "value": "24.0vp" - }, - { - "name": "max_padding_end", - "value": "24.0vp" - }, - { - "name": "menu_bg_blur_effect_enable", - "value": "$string:ohos_id_menu_bg_blur_effect_enable_default" - }, - { - "name": "menu_blur_effect_saturation", - "value": "$float:ohos_id_menu_blur_effect_saturation" - }, - { - "name": "menu_blur_effect_brightness", - "value": "$float:ohos_id_menu_blur_effect_brightness" - }, - { - "name": "menu_blur_effect_radius", - "value": "103.0vp" - }, - { - "name": "menu_blur_effect_color", - "value": "$color:ohos_id_menu_blur_effect_color" - }, - { - "name": "menu_double_border_enable", - "value": "$string:ohos_id_menu_double_border_enable_default" - }, - { - "name": "menu_item_vertical_padding", - "value": "$float:menu_item_vertical_padding_token" - }, - { - "name": "menu_item_group_title_text_font_size", - "value": "$float:menu_item_group_title_text_font_size_token" - }, - { - "name": "menu_border_radius_new", - "value": "$float:menu_border_radius_token" - }, - { - "name": "inner_border_radius_new", - "value": "16.0vp" - }, - { - "name": "menu_text_color", - "value": "$color:ohos_id_color_text_primary" - }, - { - "name": "menu_outer_border_width", - "value": "0.0vp" - }, - { - "name": "menu_outer_border_radius", - "value": "$float:ohos_id_menu_outer_border_radius" - }, - { - "name": "menu_outer_border_color", - "value": "$color:ohos_id_menu_outer_border_color" - }, - { - "name": "menu_inner_border_width", - "value": "0.0vp" - }, - { - "name": "menu_inner_border_radius", - "value": "15.0vp" - }, - { - "name": "menu_inner_border_color", - "value": "$color:ohos_id_menu_inner_border_color" - }, - { - "name": "menu_large_margin", - "value": "16.0vp" - }, - { - "name": "menu_medium_margin", - "value": "8.0vp" - }, - { - "name": "menu_has_filter", - "value": "$string:ohos_id_menu_has_filter" - }, - { - "name": "menu_normal_layout", - "value": "$string:menu_normal_layout" - }, - { - "name": "menu_normal_placement", - "value": "$string:menu_normal_placement" - }, - { - "name": "menu_back_blur", - "value": "$string:menu_back_blur" - }, - { - "name": "menu_focus_directional_key_enable", - "value": "$string:menu_focus_directional_key_enable_default" - }, - { - "name": "menu_default_shadow_style", - "value": "$float:menu_default_shadow_style" - }, - { - "name": "menu_background_blur_style", - "value": "$float:menu_background_blur_style" - }, - { - "name": "menu_item_need_focus", - "value": "1" - }, - { - "name": "menu_default_show_divider", - "value": "1" - }, - { - "name": "menu_divider_start_margin", - "value": "16.0vp" - }, - { - "name": "menu_divider_end_margin", - "value": "16.0vp" - }, - { - "name": "menu_focus_style_type", - "value": "1.0" - }, - { - "name": "select_focus_style_type", - "value": "1.0" - }, - { - "name": "option_focus_style_type", - "value": "1.0" - }, - { - "name": "select_normal_border_width", - "value": "0.5vp" - }, - { - "name": "select_normal_border_color", - "value": "#26FFFFFF" - }, - { - "name": "select_normal_shadow", - "value": "1.0" - }, - { - "name": "select_focused_shadow", - "value": "5.0" - }, - { - "name": "select_focused_scale", - "value": "1.05" - }, - { - "name": "select_focused_text_color", - "value": "#e5ffffff" - }, - { - "name": "select_focused_back_ground_color", - "value": "#7FFFFFFF" - }, - { - "name": "menu_normal_border_width", - "value": "0.0vp" - }, - { - "name": "menu_normal_border_color", - "value": "#1AFFFFFF" - }, - { - "name": "menu_normal_back_ground_blur_type", - "value": "12.0" - }, - { - "name": "option_normal_top_bottom_margin", - "value": "6.0vp" - }, - { - "name": "option_content_normal_align", - "value": "1.0" - }, - { - "name": "option_content_normal_left_right_padding", - "value": "16.0vp" - }, - { - "name": "option_focused_left_right_margin", - "value": "6.0vp" - }, - { - "name": "option_focused_back_ground_color", - "value": "#7FFFFFFF" - }, - { - "name": "option_focus_shadow", - "value": "2.0" - }, - { - "name": "option_focused_font_color", - "value": "#e5ffffff" - }, - { - "name": "option_default_shadow", - "value": "6.0" - }, - { - "name": "option_selected_border_color", - "value": "#CCFFFFFF" - }, - { - "name": "option_selected_border_width", - "value": "2.0vp" - }, - { - "name": "select_normal_left_right_margin", - "value": "0.0vp" - }, - { - "name": "option_normal_width", - "value": "$float:option_normal_width" - }, - { - "name": "select_font_size_text", - "value": "$float:select_text_size" - }, - { - "name": "menu_is_blend_bg_color", - "value": "1" - }, - { - "name": "option_focused_box_padding", - "value": "2.0vp" - }, - { - "name": "select_focused_symbol_color", - "value": "$color:select_focus_text_color" - }, - { - "name": "select_focused_icon_color", - "value": "#e5ffffff" - }, - { - "name": "option_is_apply_focus_style", - "value": "1" - }, - { - "name": "select_slide_more_offset", - "value": "$float:select_slide_more_offset" - }, - { - "name": "menu_item_hor_interval", - "value": "16.0vp" - }, - { - "name": "menu_padding_interval", - "value": "16.0vp" - }, - { - "name": "menu_haptic_feedback", - "value": "$string:menu_haptic_feedback" - } - ] - }, { "name": "ohos_slider_pattern", "value": [ -- Gitee