improve tab_button

zlgopen · Jun 13, 2024 · b3c437c · b3c437c
1 parent 48f4ea7
commit b3c437c
Show file tree

Hide file tree

Showing 26 changed files with 633 additions and 165 deletions.
diff --git a/demos/demo_ui_old_app.c b/demos/demo_ui_old_app.c
@@ -413,6 +413,12 @@ static ret_t on_close(void* ctx, event_t* e) {
  return window_close(win);
 }
 
+static ret_t on_widget_layout(void* ctx, event_t* e) {
+ widget_t* win = WIDGET(ctx);
+ (void)e;
+ return widget_layout(win);
+}
+
 static ret_t on_start(void* ctx, event_t* e) {
  widget_start_animator(NULL, NULL);
 
@@ -1148,6 +1154,8 @@ static ret_t install_one(void* ctx, const void* iter) {
  widget_on(widget, EVT_CLICK, on_dec, win);
  } else if (tk_str_eq(name, "close")) {
  widget_on(widget, EVT_CLICK, on_close, win);
+ } else if (tk_str_eq(name, "widget_layout")) {
+ widget_on(widget, EVT_CLICK, on_widget_layout, win);
  } else if (tk_str_eq(name, "fullscreen")) {
  widget_on(widget, EVT_CLICK, on_fullscreen, widget);
  } else if (tk_str_eq(name, "unload_image")) {

diff --git a/design/default/ui/tab_control.xml b/design/default/ui/tab_control.xml
@@ -5,6 +5,7 @@
  <button name="open:tab_bottom_compact" text="Bottom Compact"/>
  <button name="open:tab_list" text="List"/>
  <button name="open:tab_scrollable" text="Scrollable"/>
+ <button name="open:tab_scrollable_and_dragchild" text="Drag_Child"/>
  <button name="open:tab_dynamic_list" text="tab_dynamic_list"/>
  <button name="open:tab_remove" text="tab_remove"/>
  <button name="open:tab_invisible" text="Invisible"/>

diff --git a/design/default/ui/tab_scrollable.xml b/design/default/ui/tab_scrollable.xml
@@ -1,10 +1,10 @@
 <window anim_hint="htranslate" theme="tab_top_compact">
  <tab_button_group x="c" y="12" w="90%" h="30" compact="true" scrollable="true" enable_hscroll_animator="false" >
  <tab_button text="General"/>
- <tab_button text="Network" />
+ <tab_button text="Network111111111111111111111111111111111111111" max_w="70" ellipses="true"/>
  <tab_button name="clone_button" text="Security" value="true"/>
  </tab_button_group>
- <pages x="c" y="42" w="90%" h="-60" value="1">
+ <pages x="c" y="42" w="90%" h="-120" value="1">
  <view w="100%" h="100%">
  <label x="c" y="m" w="100%" h="60" text="General" /> 
  <button name="close" x="c" y="bottom:100" w="80" h="40" tr_text="Close" />
@@ -18,4 +18,5 @@
  <button name="clone_tab" x="c" y="bottom:100" w="80" h="40" tr_text="Clone" />
  </view>
  </pages>
+ <button name="widget_layout" x="c" y="bottom:20" w="80" h="40" text="layout" />
 </window>
diff --git a/design/default/ui/tab_scrollable_and_dragchild.xml b/design/default/ui/tab_scrollable_and_dragchild.xml
@@ -0,0 +1,22 @@
+<window anim_hint="htranslate" theme="tab_top_compact">
+ <tab_button_group x="c" y="12" w="90%" h="30" compact="true" scrollable="true" enable_hscroll_animator="false" scrollable_mode="wheel" drag_child="true" >
+ <tab_button text="General"/>
+ <tab_button text="Network111111111111111111111111111111111111111" max_w="100" ellipses="true"/>
+ <tab_button name="clone_button" text="Security" value="true"/>
+ </tab_button_group>
+ <pages x="c" y="42" w="90%" h="-120" value="2">
+ <view w="100%" h="100%">
+ <label x="c" y="m" w="100%" h="60" text="General" /> 
+ <button name="close" x="c" y="bottom:100" w="80" h="40" tr_text="Close" />
+ </view>
+ <view w="100%" h="100%">
+ <label x="c" y="m" w="100%" h="60" text="Network" /> 
+ <button name="close" x="c" y="bottom:100" w="80" h="40" tr_text="Close" />
+ </view>
+ <view name="clone_view" w="100%" h="100%">
+ <label x="c" y="m" w="100%" h="60" text="Security" /> 
+ <button name="clone_tab" x="c" y="bottom:100" w="80" h="40" tr_text="Clone" />
+ </view>
+ </pages>
+ <button name="widget_layout" x="c" y="bottom:20" w="80" h="40" text="layout" />
+</window>
diff --git a/docs/changes.md b/docs/changes.md
@@ -3,6 +3,7 @@
 2024/06/13
  * 去掉不必要的参数有效性检查(感谢朝泽提供补丁)
  * 增加滚动控件的子控件可视滚动属性(感谢智明提供补丁)
+ * 增加tab\_button的最大宽度属性和tab\_button\_group使用鼠标滚轮来滚动以及增加鼠标拖拽tab\_button功能和增加tab\_button\_group下pointer\_down就设置tab\_button的value (感谢智明提供补丁)
 
 2024/06/12
  * 修复中文输入法在输入超过15位拼音后多余的字符会直接输入到编辑框的bug(感谢泽武提供补丁)

diff --git a/res/assets/__assets_all_dark.inc b/res/assets/__assets_all_dark.inc
@@ -161,6 +161,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_dialogs_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_selectm_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_list_view_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_stroke_gradient_default[]);
+extern TK_CONST_DATA_ALIGN(const unsigned char ui_tab_scrollable_and_dragchild_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_left_middle_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_slide_view_h1_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_basic_default[]);
@@ -1092,6 +1093,7 @@ ret_t assets_init_dark(void) {
  assets_manager_add(am, ui_selectm_default);
  assets_manager_add(am, ui_list_view_default);
  assets_manager_add(am, ui_stroke_gradient_default);
+ assets_manager_add(am, ui_tab_scrollable_and_dragchild_default);
  assets_manager_add(am, ui_menu_left_middle_default);
  assets_manager_add(am, ui_slide_view_h1_default);
  assets_manager_add(am, ui_basic_default);

diff --git a/res/assets/__assets_all_default.inc b/res/assets/__assets_all_default.inc
@@ -161,6 +161,7 @@
 #include "default/inc/ui/selectm.data"
 #include "default/inc/ui/list_view.data"
 #include "default/inc/ui/stroke_gradient.data"
+#include "default/inc/ui/tab_scrollable_and_dragchild.data"
 #include "default/inc/ui/menu_left_middle.data"
 #include "default/inc/ui/slide_view_h1.data"
 #include "default/inc/ui/basic.data"
@@ -1092,6 +1093,7 @@ ret_t assets_init_default(void) {
  assets_manager_add(am, ui_selectm_default);
  assets_manager_add(am, ui_list_view_default);
  assets_manager_add(am, ui_stroke_gradient_default);
+ assets_manager_add(am, ui_tab_scrollable_and_dragchild_default);
  assets_manager_add(am, ui_menu_left_middle_default);
  assets_manager_add(am, ui_slide_view_h1_default);
  assets_manager_add(am, ui_basic_default);

diff --git a/res/assets/__assets_old_dark.inc b/res/assets/__assets_old_dark.inc
@@ -158,6 +158,7 @@ extern TK_CONST_DATA_ALIGN(const unsigned char ui_dialogs_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_selectm_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_list_view_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_stroke_gradient_default[]);
+extern TK_CONST_DATA_ALIGN(const unsigned char ui_tab_scrollable_and_dragchild_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_menu_left_middle_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_slide_view_h1_default[]);
 extern TK_CONST_DATA_ALIGN(const unsigned char ui_basic_default[]);
@@ -712,6 +713,7 @@ ret_t assets_init_dark(void) {
  assets_manager_add(am, ui_selectm_default);
  assets_manager_add(am, ui_list_view_default);
  assets_manager_add(am, ui_stroke_gradient_default);
+ assets_manager_add(am, ui_tab_scrollable_and_dragchild_default);
  assets_manager_add(am, ui_menu_left_middle_default);
  assets_manager_add(am, ui_slide_view_h1_default);
  assets_manager_add(am, ui_basic_default);

diff --git a/res/assets/__assets_old_default.inc b/res/assets/__assets_old_default.inc
@@ -158,6 +158,7 @@
 #include "default/inc/ui/selectm.data"
 #include "default/inc/ui/list_view.data"
 #include "default/inc/ui/stroke_gradient.data"
+#include "default/inc/ui/tab_scrollable_and_dragchild.data"
 #include "default/inc/ui/menu_left_middle.data"
 #include "default/inc/ui/slide_view_h1.data"
 #include "default/inc/ui/basic.data"
@@ -712,6 +713,7 @@ ret_t assets_init_default(void) {
  assets_manager_add(am, ui_selectm_default);
  assets_manager_add(am, ui_list_view_default);
  assets_manager_add(am, ui_stroke_gradient_default);
+ assets_manager_add(am, ui_tab_scrollable_and_dragchild_default);
  assets_manager_add(am, ui_menu_left_middle_default);
  assets_manager_add(am, ui_slide_view_h1_default);
  assets_manager_add(am, ui_basic_default);