From 7d75d72678497103c8cdc1c050981ed3500ac4b6 Mon Sep 17 00:00:00 2001 From: zhanghang Date: Thu, 21 Aug 2025 09:03:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20chip=20TV=E5=88=86=E5=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= 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 | 24 ++++++++++ .../resources/base/element/id_defined.json | 30 ++++++++++++ .../main/resources/tv/element/color_sys.json | 12 ++--- .../main/resources/tv/element/float.json | 6 ++- .../main/resources/tv/element/float_sys.json | 48 ++++++++++++++----- 5 files changed, 101 insertions(+), 19 deletions(-) diff --git a/systemres/main/resources/base/element/float_sys.json b/systemres/main/resources/base/element/float_sys.json index de7ba654..ccd553ea 100644 --- a/systemres/main/resources/base/element/float_sys.json +++ b/systemres/main/resources/base/element/float_sys.json @@ -1120,6 +1120,14 @@ "name": "chip_small_text_padding", "value": "12" }, + { + "name": "chip_activated_normal_text_padding", + "value": "16" + }, + { + "name": "chip_activated_small_text_padding", + "value": "12" + }, { "name": "chip_normal_text_margin", "value": "6" @@ -1136,10 +1144,22 @@ "name": "chip_small_height", "value": "28.0lpx" }, + { + "name": "chip_activated_normal_height", + "value": "36.0vp" + }, + { + "name": "chip_activated_small_height", + "value": "28.0lpx" + }, { "name": "chip_border_width", "value": "0" }, + { + "name": "chip_activated_border_width", + "value": "0" + }, { "name": "chip_normal_shadow_style", "value": "-1" @@ -1180,6 +1200,10 @@ "name": "chip_text_font_weight", "value": "400" }, + { + "name": "chip_activated_text_font_weight", + "value": "500" + }, { "name": "chip_show_close_icon_margin", "value": "0" diff --git a/systemres/main/resources/base/element/id_defined.json b/systemres/main/resources/base/element/id_defined.json index 3643dc96..c2cf1326 100644 --- a/systemres/main/resources/base/element/id_defined.json +++ b/systemres/main/resources/base/element/id_defined.json @@ -33244,6 +33244,36 @@ "name": "datapanel_track_shadow_radius", "order": 6594, "flags": "private" + }, + { + "type": "float", + "name": "chip_activated_normal_height", + "order": 6595 + }, + { + "type": "float", + "name": "chip_activated_small_height", + "order": 6596 + }, + { + "type": "float", + "name": "chip_activated_border_width", + "order": 6597 + }, + { + "type": "float", + "name": "chip_activated_normal_text_padding", + "order": 6598 + }, + { + "type": "float", + "name": "chip_activated_small_text_padding", + "order": 6599 + }, + { + "type": "float", + "name": "chip_activated_text_font_weight", + "order": 6600 } ] } diff --git a/systemres/main/resources/tv/element/color_sys.json b/systemres/main/resources/tv/element/color_sys.json index b08fb875..0728d862 100644 --- a/systemres/main/resources/tv/element/color_sys.json +++ b/systemres/main/resources/tv/element/color_sys.json @@ -322,7 +322,7 @@ }, { "name": "chip_background_color", - "value": "#00000000" + "value": "#1AFFFFFF" }, { "name": "chip_icon_focus_fill", @@ -330,7 +330,7 @@ }, { "name": "chip_border_color", - "value": "#33F1F3F5" + "value": "#26FFFFFF" }, { "name": "chip_hover_color", @@ -346,7 +346,7 @@ }, { "name": "chip_focus_color", - "value": "$color:comp_background_focus" + "value": "#5EFFFFFF" }, { "name": "chip_usually_icon_color", @@ -370,7 +370,7 @@ }, { "name": "chip_container_activated_color", - "value": "#00000000" + "value": "#1AFFFFFF" }, { "name": "chip_activated_fontcolor", @@ -378,7 +378,7 @@ }, { "name": "chip_activated_border_color", - "value": "#F1F3F5" + "value": "#FFFFFF" }, { "name": "chip_container_activated_focus_color", @@ -478,7 +478,7 @@ }, { "name": "comp_background_tertiary", - "value": "#19FFFFFF" + "value": "#1AFFFFFF" }, { "name": "font_on_primary", diff --git a/systemres/main/resources/tv/element/float.json b/systemres/main/resources/tv/element/float.json index a6c89c1f..9f906087 100644 --- a/systemres/main/resources/tv/element/float.json +++ b/systemres/main/resources/tv/element/float.json @@ -294,7 +294,11 @@ }, { "name": "chip_border_radius_normal", - "value": "20.0vp" + "value": "19.0vp" + }, + { + "name": "chip_border_radius_small", + "value": "19.0vp" }, { "name": "alpha_40", diff --git a/systemres/main/resources/tv/element/float_sys.json b/systemres/main/resources/tv/element/float_sys.json index 624e8b83..b2ee63a2 100644 --- a/systemres/main/resources/tv/element/float_sys.json +++ b/systemres/main/resources/tv/element/float_sys.json @@ -506,11 +506,19 @@ }, { "name": "chip_normal_height", - "value": "37.0vp" + "value": "36.0vp" }, { "name": "chip_small_height", - "value": "25.0vp" + "value": "36.0vp" + }, + { + "name": "chip_activated_normal_height", + "value": "34.0vp" + }, + { + "name": "chip_activated_small_height", + "value": "34.0vp" }, { "name": "chip_show_close_icon_margin", @@ -518,19 +526,27 @@ }, { "name": "chip_text_font_weight", - "value": "500" + "value": "400" + }, + { + "name": "chip_activated_text_font_weight", + "value": "400" }, { "name": "chip_normal_font_size", - "value": "18.0fp" + "value": "22.0fp" }, { "name": "chip_small_font_size", - "value": "14.0fp" + "value": "22.0fp" }, { "name": "chip_border_width", - "value": "1.5vp" + "value": "1.0vp" + }, + { + "name": "chip_activated_border_width", + "value": "2.0vp" }, { "name": "chip_focused_btn_scale", @@ -538,11 +554,19 @@ }, { "name": "chip_normal_text_padding", - "value": "10.5vp" + "value": "15.0vp" }, { "name": "chip_small_text_padding", - "value": "10.5vp" + "value": "15.0vp" + }, + { + "name": "chip_activated_normal_text_padding", + "value": "14.0vp" + }, + { + "name": "chip_activated_small_text_padding", + "value": "14.0vp" }, { "name": "chip_normal_shadow_style", @@ -554,19 +578,19 @@ }, { "name": "chip_small_icon_size", - "value": "16.0vp" + "value": "22.0vp" }, { "name": "chip_normal_icon_size", - "value": "20.0vp" + "value": "22.0vp" }, { "name": "chip_normal_text_margin", - "value": "4.0vp" + "value": "6.0vp" }, { "name": "chip_small_text_margin", - "value": "4.0vp" + "value": "6.0vp" }, { "name": "text_marquee_start_policy", -- Gitee