zlgopen/awtk
1
0
Fork 0
mirror of https://github.com/zlgopen/awtk.git synced 2025-05-08 19:44:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve scroll view

Browse Source
This commit is contained in:
lixianjing 2023-09-22 18:04:45 +08:00
parent 582d21e267
commit 12d89220d8
16 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
design/default/ui/list_view.xml
View File

@ -15,6 +15,7 @@
<button name="open:accordion2" text="Accordion Exclusive"/>
<button name="open:list_view_animate" text="Animate"/>
<button name="open:list_view_sync" text="Sync Scrolling"/>
<button name="open:scroll_view_ym" text="Test Scroll View ym"/>
<button name="close" text="Close"/>
</scroll_view>
<scroll_bar_d name="bar" x="right" y="0" w="12" h="100%" animator_time="0" value="0"/>

13
design/default/ui/scroll_view_ym.xml Normal file
View File

@ -0,0 +1,13 @@
<window name="scroll_view_ym">
<list_view name="list_view" x="0" y="30" w="100%" h="250" default_item_height="60" style:normal:border_color="#000000">
<scroll_view name="scroll_view" x="0" y="0" w="-10" h="100%" children_layout="list_view(ym=30,xm=20)" style:normal:bg_color="#D9E2F2">
<list_item name="list_item" style:normal:border="top|bottom" style:pressed:border="top|bottom" style:over:border="top|bottom" style:disable:border="top|bottom" style:focused:border="top|bottom" text="1"/>
<list_item name="list_item" h="60" text="2"/>
<list_item name="list_item" h="60" text="3"/>
<list_item name="list_item" h="60" text="4"/>
<list_item name="list_item" h="60" text="5"/>
<list_item name="list_item" h="60" text="6"/>
</scroll_view>
<scroll_bar_d name="scroll_bar" x="r" y="0" w="10" h="100%"/>
</list_view>
</window>

4
docs/changes.md
View File

@ -1,4 +1,8 @@
# 最新动态
2023/09/21
* 修改scroll\_view在children\_layout中设置ym垂直间距时，底部没有间距的bug，并在demouiold添加演示(感谢颖健提供补丁)
2023/09/20
* 修复gauge\_pointer测试用例不过的问题(感谢智明提供补丁)
* 修改fs\_stat对mingw的宽字符串问题(感谢智明提供补丁)

2
res/assets/__assets_all_dark.inc
View File

@ -146,6 +146,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_gif_image[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_down_center[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_test_view[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_auto_play_portrait[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_scroll_view_ym[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_system_bar_bottom[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_text_selector[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_rich_text_view[]);
@ -1072,6 +1073,7 @@ ret_t assets_init_dark(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

2
res/assets/__assets_all_default.inc
View File

@ -146,6 +146,7 @@
#include "default/inc/ui/menu_down_center.data"
#include "default/inc/ui/test_view.data"
#include "default/inc/ui/auto_play_portrait.data"
#include "default/inc/ui/scroll_view_ym.data"
#include "default/inc/ui/system_bar_bottom.data"
#include "default/inc/ui/text_selector.data"
#include "default/inc/ui/rich_text_view.data"
@ -1072,6 +1073,7 @@ ret_t assets_init_default(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

2
res/assets/__assets_old_dark.inc
View File

@ -141,6 +141,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_gif_image[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_down_center[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_test_view[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_auto_play_portrait[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_scroll_view_ym[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_system_bar_bottom[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_text_selector[]);
extern TK_CONST_DATA_ALIGN(const unsigned char ui_rich_text_view[]);
@ -688,6 +689,7 @@ ret_t assets_init_dark(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

2
res/assets/__assets_old_default.inc
View File

@ -141,6 +141,7 @@
#include "default/inc/ui/menu_down_center.data"
#include "default/inc/ui/test_view.data"
#include "default/inc/ui/auto_play_portrait.data"
#include "default/inc/ui/scroll_view_ym.data"
#include "default/inc/ui/system_bar_bottom.data"
#include "default/inc/ui/text_selector.data"
#include "default/inc/ui/rich_text_view.data"
@ -688,6 +689,7 @@ ret_t assets_init_default(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

9
res/assets/default/inc/ui/list_view.data
View File

@ -1,5 +1,5 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_list_view[]) = {
0x04,0x00,0x01,0x01,0x36,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x69,0x73,0x74,0x5f,0x76,0x69,0x65,
0x04,0x00,0x01,0x01,0x9a,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x6c,0x69,0x73,0x74,0x5f,0x76,0x69,0x65,
0x77,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@ -86,6 +86,11 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_list_view[]) = {
0x6c,0x69,0x6e,0x67,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,
0x6f,0x70,0x65,0x6e,0x3a,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x76,0x69,0x65,0x77,0x5f,0x79,0x6d,0x00,
0x74,0x65,0x78,0x74,0x00,0x54,0x65,0x73,0x74,0x20,0x53,0x63,0x72,0x6f,0x6c,0x6c,0x20,0x56,0x69,0x65,
0x77,0x20,0x79,0x6d,0x00,0x00,0x00,0x62,0x75,0x74,0x74,0x6f,0x6e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,
0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,0x65,0x00,0x00,0x00,0x00,
0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x62,0x61,0x72,0x5f,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@ -93,4 +98,4 @@ TK_CONST_DATA_ALIGN(const unsigned char ui_list_view[]) = {
0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x72,0x69,0x67,0x68,0x74,0x2c,0x79,0x3d,0x30,0x2c,
0x77,0x3d,0x31,0x32,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,0x62,0x61,
0x72,0x00,0x61,0x6e,0x69,0x6d,0x61,0x74,0x6f,0x72,0x5f,0x74,0x69,0x6d,0x65,0x00,0x30,0x00,0x76,0x61,
0x6c,0x75,0x65,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*1894*/
0x6c,0x75,0x65,0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*1994*/

59
res/assets/default/inc/ui/scroll_view_ym.data Normal file
View File

@ -0,0 +1,59 @@
TK_CONST_DATA_ALIGN(const unsigned char ui_scroll_view_ym[]) = {
0x04,0x00,0x01,0x01,0x58,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x76,
0x69,0x65,0x77,0x5f,0x79,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x77,0x69,0x6e,0x64,0x6f,0x77,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x76,0x69,0x65,0x77,0x5f,0x79,0x6d,0x00,0x00,0x6c,0x69,0x73,
0x74,0x5f,0x76,0x69,0x65,0x77,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x64,0x00,0x00,
0x00,0xfa,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,
0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x30,0x2c,0x79,0x3d,0x33,0x30,0x2c,0x77,0x3d,0x31,0x30,0x30,0x25,
0x2c,0x68,0x3d,0x32,0x35,0x30,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6c,0x69,0x73,0x74,0x5f,0x76,0x69,
0x65,0x77,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x5f,0x69,0x74,0x65,0x6d,0x5f,0x68,0x65,0x69,0x67,
0x68,0x74,0x00,0x36,0x30,0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3a,0x62,
0x6f,0x72,0x64,0x65,0x72,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x23,0x30,0x30,0x30,0x30,0x30,0x30,0x00,
0x00,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x76,0x69,0x65,0x77,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0xf6,0xff,0xff,0xff,0x64,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,0x6c,0x61,0x79,0x6f,0x75,0x74,
0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x30,0x2c,0x79,0x3d,0x30,0x2c,0x77,0x3d,0x2d,
0x31,0x30,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x6e,0x61,0x6d,0x65,0x00,0x73,0x63,0x72,0x6f,
0x6c,0x6c,0x5f,0x76,0x69,0x65,0x77,0x00,0x63,0x68,0x69,0x6c,0x64,0x72,0x65,0x6e,0x5f,0x6c,0x61,0x79,
0x6f,0x75,0x74,0x00,0x6c,0x69,0x73,0x74,0x5f,0x76,0x69,0x65,0x77,0x28,0x79,0x6d,0x3d,0x33,0x30,0x2c,
0x78,0x6d,0x3d,0x32,0x30,0x29,0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3a,
0x62,0x67,0x5f,0x63,0x6f,0x6c,0x6f,0x72,0x00,0x23,0x44,0x39,0x45,0x32,0x46,0x32,0x00,0x00,0x6c,0x69,
0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,
0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x6e,0x6f,0x72,0x6d,0x61,0x6c,0x3a,0x62,0x6f,0x72,0x64,0x65,0x72,
0x00,0x74,0x6f,0x70,0x7c,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x70,0x72,
0x65,0x73,0x73,0x65,0x64,0x3a,0x62,0x6f,0x72,0x64,0x65,0x72,0x00,0x74,0x6f,0x70,0x7c,0x62,0x6f,0x74,
0x74,0x6f,0x6d,0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x6f,0x76,0x65,0x72,0x3a,0x62,0x6f,0x72,0x64,0x65,
0x72,0x00,0x74,0x6f,0x70,0x7c,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x64,
0x69,0x73,0x61,0x62,0x6c,0x65,0x3a,0x62,0x6f,0x72,0x64,0x65,0x72,0x00,0x74,0x6f,0x70,0x7c,0x62,0x6f,
0x74,0x74,0x6f,0x6d,0x00,0x73,0x74,0x79,0x6c,0x65,0x3a,0x66,0x6f,0x63,0x75,0x73,0x65,0x64,0x3a,0x62,
0x6f,0x72,0x64,0x65,0x72,0x00,0x74,0x6f,0x70,0x7c,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x00,0x74,0x65,0x78,
0x74,0x00,0x31,0x00,0x00,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6c,
0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x74,0x65,0x78,0x74,0x00,0x32,0x00,0x00,0x00,0x6c,0x69,
0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x3c,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,
0x00,0x74,0x65,0x78,0x74,0x00,0x33,0x00,0x00,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x6e,0x61,
0x6d,0x65,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x74,0x65,0x78,0x74,0x00,0x34,0x00,
0x00,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6c,0x69,0x73,0x74,0x5f,
0x69,0x74,0x65,0x6d,0x00,0x74,0x65,0x78,0x74,0x00,0x35,0x00,0x00,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,
0x74,0x65,0x6d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3c,0x00,
0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6c,0x69,0x73,0x74,0x5f,0x69,0x74,0x65,0x6d,0x00,0x74,0x65,0x78,
0x74,0x00,0x36,0x00,0x00,0x00,0x00,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x62,0x61,0x72,0x5f,0x64,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x64,0x00,0x00,0x00,0x73,0x65,0x6c,0x66,0x5f,
0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x64,0x65,0x66,0x61,0x75,0x6c,0x74,0x28,0x78,0x3d,0x72,0x2c,0x79,
0x3d,0x30,0x2c,0x77,0x3d,0x31,0x30,0x2c,0x68,0x3d,0x31,0x30,0x30,0x25,0x29,0x00,0x6e,0x61,0x6d,0x65,
0x00,0x73,0x63,0x72,0x6f,0x6c,0x6c,0x5f,0x62,0x61,0x72,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*1160*/

BIN
res/assets/default/raw/ui/list_view.bin
View File

Binary file not shown.

BIN
res/assets/default/raw/ui/scroll_view_ym.bin Normal file
View File

Binary file not shown.

2
res/assets_all_dark.inc
View File

@ -146,6 +146,7 @@
#include "assets/default/inc/ui/menu_down_center.data"
#include "assets/default/inc/ui/test_view.data"
#include "assets/default/inc/ui/auto_play_portrait.data"
#include "assets/default/inc/ui/scroll_view_ym.data"
#include "assets/default/inc/ui/system_bar_bottom.data"
#include "assets/default/inc/ui/text_selector.data"
#include "assets/default/inc/ui/rich_text_view.data"
@ -1072,6 +1073,7 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

2
res/assets_all_default.inc
View File

@ -146,6 +146,7 @@
#include "assets/default/inc/ui/menu_down_center.data"
#include "assets/default/inc/ui/test_view.data"
#include "assets/default/inc/ui/auto_play_portrait.data"
#include "assets/default/inc/ui/scroll_view_ym.data"
#include "assets/default/inc/ui/system_bar_bottom.data"
#include "assets/default/inc/ui/text_selector.data"
#include "assets/default/inc/ui/rich_text_view.data"
@ -1072,6 +1073,7 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

2
res/assets_old_dark.inc
View File

@ -141,6 +141,7 @@
#include "assets/default/inc/ui/menu_down_center.data"
#include "assets/default/inc/ui/test_view.data"
#include "assets/default/inc/ui/auto_play_portrait.data"
#include "assets/default/inc/ui/scroll_view_ym.data"
#include "assets/default/inc/ui/system_bar_bottom.data"
#include "assets/default/inc/ui/text_selector.data"
#include "assets/default/inc/ui/rich_text_view.data"
@ -688,6 +689,7 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

2
res/assets_old_default.inc
View File

@ -141,6 +141,7 @@
#include "assets/default/inc/ui/menu_down_center.data"
#include "assets/default/inc/ui/test_view.data"
#include "assets/default/inc/ui/auto_play_portrait.data"
#include "assets/default/inc/ui/scroll_view_ym.data"
#include "assets/default/inc/ui/system_bar_bottom.data"
#include "assets/default/inc/ui/text_selector.data"
#include "assets/default/inc/ui/rich_text_view.data"
@ -688,6 +689,7 @@ ret_t assets_init(void) {
assets_manager_add(am, ui_menu_down_center);
assets_manager_add(am, ui_test_view);
assets_manager_add(am, ui_auto_play_portrait);
assets_manager_add(am, ui_scroll_view_ym);
assets_manager_add(am, ui_system_bar_bottom);
assets_manager_add(am, ui_text_selector);
assets_manager_add(am, ui_rich_text_view);

3
src/ext_widgets/scroll_view/children_layouter_list_view.c
View File

@ -364,6 +364,9 @@ static int32_t children_layouter_list_view_for_list_view_get_virtual_h(
virtual_h += (h + spacing);
}
}
virtual_h += y_margin;
return virtual_h;
}