Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

page, tabview bidi fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-10-17 06:10:29 +02:00
parent dbaaaa31a6
commit 73a0686672
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lv_objx/lv_page.c
View File

@ -876,7 +876,9 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param)
lv_fit_t fit_left = lv_page_get_scrl_fit_left(page);
lv_fit_t fit_right = lv_page_get_scrl_fit_right(page);
lv_fit_t fit_top = lv_page_get_scrl_fit_top(page);
child = lv_obj_get_child(page, NULL);
lv_bidi_dir_t base_dir = lv_obj_get_base_dir(page);
child = lv_obj_get_child(page, NULL);
while(child != NULL) {
if(lv_obj_is_protected(child, LV_PROTECT_PARENT) == false) {
lv_obj_t * tmp = child;
@ -884,13 +886,17 @@ static lv_res_t lv_page_signal(lv_obj_t * page, lv_signal_t sign, void * param)
/* Reposition the child to take padding into account (Only if it's on (0;0) or (widht;height) coordinates now)
* It's required to keep new the object on the same coordinate if FIT is enabled.*/
if((tmp->coords.x1 == page->coords.x1) && (fit_left == LV_FIT_TIGHT || fit_left == LV_FIT_FILL)) {
if((tmp->coords.x1 == page->coords.x1) &&
(fit_right == LV_FIT_TIGHT || fit_right == LV_FIT_FILL) &&
base_dir != LV_BIDI_DIR_RTL) {
tmp->coords.x1 += style_scrl->body.padding.left;
tmp->coords.x2 += style_scrl->body.padding.left;
}
else if((tmp->coords.x2 == page->coords.x2) && (fit_right == LV_FIT_TIGHT || fit_right == LV_FIT_FILL)) {
tmp->coords.x1 -= style_scrl->body.padding.right + style_bg->body.padding.right;
tmp->coords.x2 -= style_scrl->body.padding.right + style_bg->body.padding.right;
else if((tmp->coords.x2 == page->coords.x2) &&
(fit_right == LV_FIT_TIGHT || fit_right == LV_FIT_FILL)
&& base_dir == LV_BIDI_DIR_RTL) {
tmp->coords.x1 -= style_scrl->body.padding.right;
tmp->coords.x2 -= style_scrl->body.padding.right;
}
if((tmp->coords.y1 == page->coords.y1) && (fit_top == LV_FIT_TIGHT || fit_top == LV_FIT_FILL)) {
tmp->coords.y1 += style_scrl->body.padding.top;

24
src/lv_objx/lv_tabview.c
View File

@ -220,8 +220,8 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * tabview, const char * name)
lv_obj_t * h = lv_page_create(ext->content, NULL);
lv_obj_set_size(h, lv_obj_get_width(tabview), lv_obj_get_height(ext->content));
lv_page_set_sb_mode(h, LV_SB_MODE_AUTO);
lv_page_set_style(h, LV_PAGE_STYLE_BG, &lv_style_plain);
lv_page_set_style(h, LV_PAGE_STYLE_SCRL, &lv_style_transp);
lv_page_set_style(h, LV_PAGE_STYLE_BG, &lv_style_pretty);
lv_page_set_style(h, LV_PAGE_STYLE_SCRL, &lv_style_pretty_color);
lv_page_set_scroll_propagation(h, true);
if(page_signal == NULL) page_signal = lv_obj_get_signal_cb(h);
@ -239,9 +239,6 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * tabview, const char * name)
* Method: clean extra \n when switch from LV_TABVIEW_BTNS_POS_LEFT or LV_TABVIEW_BTNS_POS_RIGHT
* to LV_TABVIEW_BTNS_POS_TOP or LV_TABVIEW_BTNS_POS_BOTTOM.
*/
const lv_style_t * style_tabs = lv_obj_get_style(ext->btns);
lv_coord_t indic_size;
switch(ext->btns_pos) {
case LV_TABVIEW_BTNS_POS_NONE:
case LV_TABVIEW_BTNS_POS_TOP:
@ -362,11 +359,6 @@ void lv_tabview_set_tab_act(lv_obj_t * tabview, uint16_t id, lv_anim_enable_t an
}
#endif
lv_bidi_dir_t base_dir = lv_obj_get_base_dir(tabview);
if(base_dir == LV_BIDI_DIR_RTL) id = ext->tab_cnt - id - 1;
/*Move the indicator*/
const lv_style_t * tabs_style = lv_obj_get_style(ext->btns);
lv_coord_t indic_size;
@ -735,13 +727,19 @@ static lv_res_t tabview_scrl_signal(lv_obj_t * tabview_scrl, lv_signal_t sign, v
lv_coord_t page_x2 = page_x1 + lv_obj_get_width(tabview);
lv_coord_t treshold = lv_obj_get_width(tabview) / 2;
uint16_t tab_cur = ext->tab_cur;
lv_bidi_dir_t base_dir = lv_obj_get_base_dir(tabview);
int16_t tab_cur = ext->tab_cur;
if(page_x1 > treshold) {
if(tab_cur != 0) tab_cur--;
if(base_dir != LV_BIDI_DIR_RTL) tab_cur--;
else tab_cur ++;
} else if(page_x2 < treshold) {
if(tab_cur < ext->tab_cnt - 1) tab_cur++;
if(base_dir != LV_BIDI_DIR_RTL) tab_cur++;
else tab_cur --;
}
if(tab_cur > ext->tab_cnt - 1) tab_cur = ext->tab_cnt - 1;
if(tab_cur < 0) tab_cur = 0;
uint32_t id_prev = lv_tabview_get_tab_act(tabview);
lv_tabview_set_tab_act(tabview, tab_cur, LV_ANIM_ON);
uint32_t id_new = lv_tabview_get_tab_act(tabview);