minor renames

src/lv_themes/lv_theme_material.c

@@ -1158,8 +1158,8 @@ void lv_theme_material_apply(lv_obj_t * obj, lv_theme_style_t name)
             list = lv_obj_get_style_list(obj, LV_ROLLER_PART_BG);
             lv_style_list_add_style(list, &roller_bg);
 
-            lv_obj_clean_style_list(obj, LV_ROLLER_PART_SEL);
+            lv_obj_clean_style_list(obj, LV_ROLLER_PART_SELECTED);
-            list = lv_obj_get_style_list(obj, LV_ROLLER_PART_SEL);
+            list = lv_obj_get_style_list(obj, LV_ROLLER_PART_SELECTED);
             lv_style_list_add_style(list, &roller_sel);
             break;
 #endif

src/lv_themes/lv_theme_template.c

@@ -687,8 +687,8 @@ void lv_theme_material_apply(lv_obj_t * obj, lv_theme_style_t name)
             list = lv_obj_get_style_list(obj, LV_ROLLER_PART_BG);
             lv_style_list_add_style(list, &style_bg);
 
-            lv_obj_clean_style_list(obj, LV_ROLLER_PART_SEL);
+            lv_obj_clean_style_list(obj, LV_ROLLER_PART_SELECTED);
-            list = lv_obj_get_style_list(obj, LV_ROLLER_PART_SEL);
+            list = lv_obj_get_style_list(obj, LV_ROLLER_PART_SELECTED);
             lv_style_list_add_style(list, &style_bg);
             lv_style_list_add_style(list, &style_color);
             break;

src/lv_widgets/lv_list.c

@@ -97,7 +97,7 @@ lv_obj_t * lv_list_create(lv_obj_t * par, const lv_obj_t * copy)
         lv_page_set_scrl_fit2(list, LV_FIT_PARENT, LV_FIT_TIGHT);
         lv_obj_set_size(list, 2 * LV_DPI, 3 * LV_DPI);
         lv_page_set_scrl_layout(list, LV_LIST_LAYOUT_DEF);
-        lv_list_set_sb_mode(list, LV_SB_MODE_DRAG);
+        lv_list_set_sb_mode(list, LV_SCRLBAR_MODE_DRAG);
 
         lv_theme_apply(list, LV_THEME_LIST);
 

src/lv_widgets/lv_list.h

@@ -122,7 +122,7 @@ void lv_list_focus_btn(lv_obj_t * list, lv_obj_t * btn);
  * @param list pointer to a list object
  * @param sb_mode the new mode from 'lv_page_sb_mode_t' enum
  */
-static inline void lv_list_set_sb_mode(lv_obj_t * list, lv_sb_mode_t mode)
+static inline void lv_list_set_sb_mode(lv_obj_t * list, lv_scrlbar_mode_t mode)
 {
     lv_page_set_scrlbar_mode(list, mode);
 }
@@ -241,7 +241,7 @@ lv_layout_t lv_list_get_layout(lv_obj_t * list);
  * @param list pointer to a list object
  * @return scrollbar mode from 'lv_page_sb_mode_t' enum
  */
-static inline lv_sb_mode_t lv_list_get_sb_mode(const lv_obj_t * list)
+static inline lv_scrlbar_mode_t lv_list_get_sb_mode(const lv_obj_t * list)
 {
     return lv_page_get_sb_mode(list);
 }

src/lv_widgets/lv_msgbox.c

@@ -408,9 +408,12 @@ static lv_res_t lv_msgbox_signal(lv_obj_t * mbox, lv_signal_t sign, void * param
     else if(sign == LV_SIGNAL_GET_STATE_DSC) {
         lv_get_state_info_t * info = param;
         lv_msgbox_ext_t * ext = lv_obj_get_ext_attr(mbox);
-        if(ext->btnm && info->part == LV_MSGBOX_PART_BTN_BG) info->result = lv_obj_get_state(ext->btnm, LV_BTNMATRIX_PART_BG);
+        if(ext->btnm && info->part == LV_MSGBOX_PART_BTN_BG) {
-        else if(ext->btnm &&
+            info->result = lv_obj_get_state(ext->btnm, LV_BTNMATRIX_PART_BG);
-                info->part == LV_MSGBOX_PART_BTN) info->result = lv_obj_get_state(ext->btnm, LV_BTNMATRIX_PART_BTN);
+        }
+        else if(ext->btnm && info->part == LV_MSGBOX_PART_BTN) {
+            info->result = lv_obj_get_state(ext->btnm, LV_BTNMATRIX_PART_BTN);
+        }
         return LV_RES_OK;
     }
 

src/lv_widgets/lv_page.c

@@ -99,7 +99,7 @@ lv_obj_t * lv_page_create(lv_obj_t * par, const lv_obj_t * copy)
     lv_style_list_init(&ext->scrlbar.style);
     ext->scrlbar.hor_draw = 0;
     ext->scrlbar.ver_draw = 0;
-    ext->scrlbar.mode     = LV_SB_MODE_AUTO;
+    ext->scrlbar.mode     = LV_SCRLBAR_MODE_AUTO;
 #if LV_USE_ANIMATION
     lv_style_list_init(&ext->edge_flash.style);
     ext->edge_flash.enabled   = 0;
@@ -180,19 +180,19 @@ void lv_page_clean(lv_obj_t * page)
  * @param page pointer to a page object
  * @param sb_mode the new mode from 'lv_page_sb.mode_t' enum
  */
-void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_sb_mode_t sb_mode)
+void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_scrlbar_mode_t sb_mode)
 {
     LV_ASSERT_OBJ(page, LV_OBJX_NAME);
 
     lv_page_ext_t * ext = lv_obj_get_ext_attr(page);
     if(ext->scrlbar.mode == sb_mode) return;
 
-    if(sb_mode == LV_SB_MODE_HIDE)
+    if(sb_mode == LV_SCRLBAR_MODE_HIDE)
-        ext->scrlbar.mode |= LV_SB_MODE_HIDE; /*Set the hidden flag*/
+        ext->scrlbar.mode |= LV_SCRLBAR_MODE_HIDE; /*Set the hidden flag*/
-    else if(sb_mode == LV_SB_MODE_UNHIDE)
+    else if(sb_mode == LV_SCRLBAR_MODE_UNHIDE)
-        ext->scrlbar.mode &= (~LV_SB_MODE_HIDE); /*Clear the hidden flag*/
+        ext->scrlbar.mode &= (~LV_SCRLBAR_MODE_HIDE); /*Clear the hidden flag*/
     else {
-        if(ext->scrlbar.mode & LV_SB_MODE_HIDE) sb_mode |= LV_SB_MODE_HIDE;
+        if(ext->scrlbar.mode & LV_SCRLBAR_MODE_HIDE) sb_mode |= LV_SCRLBAR_MODE_HIDE;
         ext->scrlbar.mode = sb_mode;
     }
 
@@ -299,7 +299,7 @@ uint16_t lv_page_get_anim_time(const lv_obj_t * page)
  * @param page pointer to a page object
  * @return the mode from 'lv_page_sb.mode_t' enum
  */
-lv_sb_mode_t lv_page_get_sb_mode(const lv_obj_t * page)
+lv_scrlbar_mode_t lv_page_get_sb_mode(const lv_obj_t * page)
 {
     LV_ASSERT_OBJ(page, LV_OBJX_NAME);
 
@@ -659,11 +659,11 @@ static lv_design_res_t lv_page_design(lv_obj_t * page, const lv_area_t * clip_ar
             lv_draw_rect_dsc_t rect_dsc;
             lv_draw_rect_dsc_init(&rect_dsc);
             lv_obj_init_draw_rect_dsc(page, LV_PAGE_PART_SCRLBAR, &rect_dsc);
-            if(ext->scrlbar.hor_draw && (ext->scrlbar.mode & LV_SB_MODE_HIDE) == 0) {
+            if(ext->scrlbar.hor_draw && (ext->scrlbar.mode & LV_SCRLBAR_MODE_HIDE) == 0) {
                 lv_draw_rect(&sb_hor_area, clip_area, &rect_dsc);
             }
 
-            if(ext->scrlbar.ver_draw && (ext->scrlbar.mode & LV_SB_MODE_HIDE) == 0) {
+            if(ext->scrlbar.ver_draw && (ext->scrlbar.mode & LV_SCRLBAR_MODE_HIDE) == 0) {
                 lv_draw_rect(&sb_ver_area, clip_area, &rect_dsc);
             }
         }
@@ -1008,7 +1008,7 @@ static lv_res_t lv_page_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, voi
         }
 
         /*Hide scrollbars if required*/
-        if(page_ext->scrlbar.mode == LV_SB_MODE_DRAG) {
+        if(page_ext->scrlbar.mode == LV_SCRLBAR_MODE_DRAG) {
             lv_area_t sb_area_tmp;
             if(page_ext->scrlbar.hor_draw) {
                 lv_area_copy(&sb_area_tmp, &page_ext->scrlbar.hor_area);
@@ -1136,9 +1136,9 @@ static void lv_page_sb_refresh(lv_obj_t * page)
     lv_coord_t sb_hor_pad = LV_MATH_MAX(sb_width, sb_right);
     lv_coord_t sb_ver_pad = LV_MATH_MAX(sb_width, sb_bottom);
 
-    if(ext->scrlbar.mode == LV_SB_MODE_OFF) return;
+    if(ext->scrlbar.mode == LV_SCRLBAR_MODE_OFF) return;
 
-    if(ext->scrlbar.mode == LV_SB_MODE_ON) {
+    if(ext->scrlbar.mode == LV_SCRLBAR_MODE_ON) {
         ext->scrlbar.hor_draw = 1;
         ext->scrlbar.ver_draw = 1;
     }
@@ -1162,7 +1162,7 @@ static void lv_page_sb_refresh(lv_obj_t * page)
         lv_obj_invalidate_area(page, &sb_area_tmp);
     }
 
-    if(ext->scrlbar.mode == LV_SB_MODE_DRAG && lv_indev_is_dragging(lv_indev_get_act()) == false) {
+    if(ext->scrlbar.mode == LV_SCRLBAR_MODE_DRAG && lv_indev_is_dragging(lv_indev_get_act()) == false) {
         ext->scrlbar.hor_draw = 0;
         ext->scrlbar.ver_draw = 0;
         return;
@@ -1173,7 +1173,7 @@ static void lv_page_sb_refresh(lv_obj_t * page)
         lv_area_set_width(&ext->scrlbar.hor_area, obj_w - 2 * sb_hor_pad);
         lv_area_set_pos(&ext->scrlbar.hor_area, sb_hor_pad,
                         obj_h - sb_width - sb_bottom);
-        if(ext->scrlbar.mode == LV_SB_MODE_AUTO || ext->scrlbar.mode == LV_SB_MODE_DRAG) ext->scrlbar.hor_draw = 0;
+        if(ext->scrlbar.mode == LV_SCRLBAR_MODE_AUTO || ext->scrlbar.mode == LV_SCRLBAR_MODE_DRAG) ext->scrlbar.hor_draw = 0;
     }
     /*Smaller horizontal scrollbar*/
     else {
@@ -1188,7 +1188,7 @@ static void lv_page_sb_refresh(lv_obj_t * page)
                         (scrl_w + bg_left + bg_right - obj_w),
                         obj_h - sb_width - sb_bottom);
 
-        if(ext->scrlbar.mode == LV_SB_MODE_AUTO || ext->scrlbar.mode == LV_SB_MODE_DRAG) ext->scrlbar.hor_draw = 1;
+        if(ext->scrlbar.mode == LV_SCRLBAR_MODE_AUTO || ext->scrlbar.mode == LV_SCRLBAR_MODE_DRAG) ext->scrlbar.hor_draw = 1;
     }
 
     /*Full sized vertical scroll bar*/
@@ -1196,7 +1196,7 @@ static void lv_page_sb_refresh(lv_obj_t * page)
         lv_area_set_height(&ext->scrlbar.ver_area, obj_h - 2 * sb_ver_pad);
         lv_area_set_pos(&ext->scrlbar.ver_area,
                         obj_w - sb_width - sb_right, sb_ver_pad);
-        if(ext->scrlbar.mode == LV_SB_MODE_AUTO || ext->scrlbar.mode == LV_SB_MODE_DRAG) ext->scrlbar.ver_draw = 0;
+        if(ext->scrlbar.mode == LV_SCRLBAR_MODE_AUTO || ext->scrlbar.mode == LV_SCRLBAR_MODE_DRAG) ext->scrlbar.ver_draw = 0;
     }
     /*Smaller vertical scroll bar*/
     else {
@@ -1211,7 +1211,7 @@ static void lv_page_sb_refresh(lv_obj_t * page)
                                       (obj_h - size_tmp - 2 * sb_ver_pad)) /
                         (scrl_h + bg_top + bg_bottom - obj_h));
 
-        if(ext->scrlbar.mode == LV_SB_MODE_AUTO || ext->scrlbar.mode == LV_SB_MODE_DRAG) ext->scrlbar.ver_draw = 1;
+        if(ext->scrlbar.mode == LV_SCRLBAR_MODE_AUTO || ext->scrlbar.mode == LV_SCRLBAR_MODE_DRAG) ext->scrlbar.ver_draw = 1;
     }
 
     /*Invalidate the new scrollbar areas*/

src/lv_widgets/lv_page.h

@@ -36,14 +36,14 @@ extern "C" {
 
 /** Scrollbar modes: shows when should the scrollbars be visible*/
 enum {
-    LV_SB_MODE_OFF    = 0x0, /**< Never show scrollbars*/
+    LV_SCRLBAR_MODE_OFF    = 0x0, /**< Never show scroll bars*/
-    LV_SB_MODE_ON     = 0x1, /**< Always show scrollbars*/
+    LV_SCRLBAR_MODE_ON     = 0x1, /**< Always show scroll bars*/
-    LV_SB_MODE_DRAG   = 0x2, /**< Show scrollbars when page is being dragged*/
+    LV_SCRLBAR_MODE_DRAG   = 0x2, /**< Show scroll bars when page is being dragged*/
-    LV_SB_MODE_AUTO   = 0x3, /**< Show scrollbars when the scrollable container is large enough to be scrolled*/
+    LV_SCRLBAR_MODE_AUTO   = 0x3, /**< Show scroll bars when the scrollable container is large enough to be scrolled*/
-    LV_SB_MODE_HIDE   = 0x4, /**< Hide the scroll bar temporally*/
+    LV_SCRLBAR_MODE_HIDE   = 0x4, /**< Hide the scroll bar temporally*/
-    LV_SB_MODE_UNHIDE = 0x5, /**< Unhide the previously hidden scrollbar. Recover it's type too*/
+    LV_SCRLBAR_MODE_UNHIDE = 0x5, /**< Unhide the previously hidden scroll bar. Recover original mode too*/
 };
-typedef uint8_t lv_sb_mode_t;
+typedef uint8_t lv_scrlbar_mode_t;
 
 /** Edges: describes the four edges of the page*/
 enum { LV_PAGE_EDGE_LEFT = 0x1, LV_PAGE_EDGE_TOP = 0x2, LV_PAGE_EDGE_RIGHT = 0x4, LV_PAGE_EDGE_BOTTOM = 0x8 };
@@ -60,7 +60,7 @@ typedef struct {
         lv_area_t ver_area;       /*Vertical scrollbar area relative to the page (Handled by the library)*/
         uint8_t hor_draw : 1;     /*1: horizontal scrollbar is visible now (Handled by the library)*/
         uint8_t ver_draw : 1;     /*1: vertical scrollbar is visible now (Handled by the library)*/
-        lv_sb_mode_t mode : 3;    /*Scrollbar visibility from 'lv_page_sb_mode_t'*/
+        lv_scrlbar_mode_t mode : 3;    /*Scrollbar visibility from 'lv_page_sb_mode_t'*/
     } scrlbar;
 #if LV_USE_ANIMATION
     struct {
@@ -135,7 +135,7 @@ uint16_t lv_page_get_anim_time(const lv_obj_t * page);
  * @param page pointer to a page object
  * @param sb_mode the new mode from 'lv_page_sb.mode_t' enum
  */
-void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_sb_mode_t sb_mode);
+void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_scrlbar_mode_t sb_mode);
 
 /**
  * Set the animation time for the page
@@ -237,7 +237,7 @@ static inline void lv_page_set_scrl_layout(lv_obj_t * page, lv_layout_t layout)
  * @param page pointer to a page object
  * @return the mode from 'lv_page_sb.mode_t' enum
  */
-lv_sb_mode_t lv_page_get_sb_mode(const lv_obj_t * page);
+lv_scrlbar_mode_t lv_page_get_sb_mode(const lv_obj_t * page);
 
 /**
  * Get the scroll propagation property

src/lv_widgets/lv_roller.c

@@ -103,7 +103,7 @@ lv_obj_t * lv_roller_create(lv_obj_t * par, const lv_obj_t * copy)
         lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
 
         lv_obj_t * scrl = lv_page_get_scrl(roller);
-        lv_obj_set_drag(scrl, true);                                  /*In ddlist it might be disabled*/
+        lv_obj_set_drag(scrl, true);
         lv_page_set_scrl_fit2(roller, LV_FIT_PARENT, LV_FIT_NONE); /*Height is specified directly*/
         lv_roller_set_anim_time(roller, LV_ROLLER_DEF_ANIM_TIME);
         lv_roller_set_options(roller, "Option 1\nOption 2\nOption 3\nOption 4\nOption 5", LV_ROLLER_MODE_NORMAL);
@@ -389,14 +389,14 @@ static lv_design_res_t lv_roller_design(lv_obj_t * roller, const lv_area_t * cli
 
         lv_draw_rect_dsc_t sel_dsc;
         lv_draw_rect_dsc_init(&sel_dsc);
-        lv_obj_init_draw_rect_dsc(roller, LV_ROLLER_PART_SEL, &sel_dsc);
+        lv_obj_init_draw_rect_dsc(roller, LV_ROLLER_PART_SELECTED, &sel_dsc);
         lv_draw_rect(&rect_area, clip_area, &sel_dsc);
     }
     /*Post draw when the children are drawn*/
     else if(mode == LV_DESIGN_DRAW_POST) {
         lv_draw_label_dsc_t label_dsc;
         lv_draw_label_dsc_init(&label_dsc);
-        lv_obj_init_draw_label_dsc(roller, LV_ROLLER_PART_SEL, &label_dsc);
+        lv_obj_init_draw_label_dsc(roller, LV_ROLLER_PART_SELECTED, &label_dsc);
 
         lv_coord_t font_h        = lv_font_get_line_height(label_dsc.font);
 
@@ -527,7 +527,7 @@ static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * par
         }
     }
     else if(sign == LV_SIGNAL_CLEANUP) {
-        lv_obj_clean_style_list(roller, LV_ROLLER_PART_SEL);
+        lv_obj_clean_style_list(roller, LV_ROLLER_PART_SELECTED);
     }
     return res;
 }
@@ -549,7 +549,7 @@ static lv_style_list_t * lv_roller_get_style(lv_obj_t * roller, uint8_t part)
         case LV_ROLLER_PART_BG:
             style_dsc_p = &roller->style_list;
             break;
-        case LV_ROLLER_PART_SEL:
+        case LV_ROLLER_PART_SELECTED:
             style_dsc_p = &ext->style_sel;
             break;
         default:

src/lv_widgets/lv_roller.h

@@ -58,7 +58,7 @@ typedef struct {
 
 enum {
     LV_ROLLER_PART_BG = LV_PAGE_PART_BG,
-    LV_ROLLER_PART_SEL = _LV_PAGE_PART_VIRTUAL_LAST,
+    LV_ROLLER_PART_SELECTED = _LV_PAGE_PART_VIRTUAL_LAST,
     _LV_ROLLER_PART_VIRTUAL_LAST,
 };
 typedef uint8_t lv_roller_part_t;
@@ -168,12 +168,6 @@ static inline uint16_t lv_roller_get_anim_time(const lv_obj_t * roller)
     return lv_page_get_anim_time(roller);
 }
 
-/**
- * Get the auto width set attribute
- * @param roller pointer to a roller object
- * @return true: auto size enabled; false: manual width settings enabled
- */
-bool lv_roller_get_hor_fit(const lv_obj_t * roller);
 
 /**********************
  *      MACROS

src/lv_widgets/lv_slider.h

@@ -35,10 +35,11 @@ extern "C" {
 
 enum {
     LV_SLIDER_TYPE_NORMAL,
-    LV_SLIDER_TYPE_SYM,
+    LV_SLIDER_TYPE_SYMMETRICAL,
     LV_SLIDER_TYPE_RANGE
 };
 typedef uint8_t lv_slider_type_t;
+
 /*Data of slider*/
 typedef struct {
     lv_bar_ext_t bar; /*Ext. of ancestor*/
@@ -56,7 +57,6 @@ enum {
     LV_SLIDER_PART_INDIC, /** Slider indicator (filled area) style. */
     LV_SLIDER_PART_KNOB, /** Slider knob style. */
 };
-typedef uint8_t lv_slider_style_t;
 
 /**********************
  * GLOBAL PROTOTYPES
@@ -127,7 +127,7 @@ static inline void lv_slider_set_type(lv_obj_t * slider, lv_slider_type_t type)
 {
     if(type == LV_SLIDER_TYPE_NORMAL)
         lv_bar_set_type(slider, LV_BAR_TYPE_NORMAL);
-    else if(type == LV_SLIDER_TYPE_SYM)
+    else if(type == LV_SLIDER_TYPE_SYMMETRICAL)
         lv_bar_set_type(slider, LV_BAR_TYPE_SYMMETRICAL);
     else if(type == LV_SLIDER_TYPE_RANGE)
         lv_bar_set_type(slider, LV_BAR_TYPE_CUSTOM);
@@ -181,13 +181,6 @@ static inline int16_t lv_slider_get_max_value(const lv_obj_t * slider)
  */
 bool lv_slider_is_dragged(const lv_obj_t * slider);
 
-/**
- * Get an image to display on the knob of the slider
- * @param slider pointer to a slider object
- * @return the image source: pointer to an `lv_img_dsc_t` variable or a path to an image  (not an `lv_img` object)
- */
-const void * lv_slider_get_knob_img(lv_obj_t * slider, const void * img_src);
-
 /**
  * Get the animation time of the slider
  * @param slider pointer to a slider object
@@ -207,7 +200,7 @@ static inline lv_slider_type_t lv_slider_get_type(lv_obj_t * slider)
 {
     lv_bar_type_t type = lv_bar_get_type(slider);
     if(type == LV_BAR_TYPE_SYMMETRICAL)
-        return LV_SLIDER_TYPE_SYM;
+        return LV_SLIDER_TYPE_SYMMETRICAL;
     else if(type == LV_BAR_TYPE_CUSTOM)
         return LV_SLIDER_TYPE_RANGE;
     else

src/lv_widgets/lv_tabview.c

@@ -140,7 +140,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * par, const lv_obj_t * copy)
 
         lv_page_set_scrl_fit2(ext->content, LV_FIT_TIGHT, LV_FIT_PARENT);
         lv_page_set_scrl_layout(ext->content, LV_LAYOUT_ROW_TOP);
-        lv_page_set_scrlbar_mode(ext->content, LV_SB_MODE_OFF);
+        lv_page_set_scrlbar_mode(ext->content, LV_SCRLBAR_MODE_OFF);
 
         lv_obj_clean_style_list(ext->content, LV_PAGE_PART_BG);
 
@@ -226,7 +226,7 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * tabview, const char * name)
     /*Create the container page*/
     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_scrlbar_mode(h, LV_SB_MODE_AUTO);
+    lv_page_set_scrlbar_mode(h, LV_SCRLBAR_MODE_AUTO);
     lv_page_set_scroll_propagation(h, true);
     lv_theme_apply(h, LV_THEME_TABVIEW_PAGE);
 

src/lv_widgets/lv_textarea.c

@@ -149,7 +149,7 @@ lv_obj_t * lv_textarea_create(lv_obj_t * par, const lv_obj_t * copy)
         lv_label_set_text(ext->label, "Text area");
         lv_obj_set_click(ext->label, false);
         lv_obj_set_size(ta, LV_TEXTAREA_DEF_WIDTH, LV_TEXTAREA_DEF_HEIGHT);
-        lv_textarea_set_sb_mode(ta, LV_SB_MODE_DRAG);
+        lv_textarea_set_sb_mode(ta, LV_SCRLBAR_MODE_DRAG);
 
         lv_obj_reset_style_list(ta, LV_PAGE_PART_SCRL);
         lv_theme_apply(ta, LV_THEME_TEXTAREA);

src/lv_widgets/lv_textarea.h

@@ -224,7 +224,7 @@ void lv_textarea_set_insert_replace(lv_obj_t * ta, const char * txt);
  * @param ta pointer to a text area object
  * @param sb_mode the new mode from 'lv_page_sb_mode_t' enum
  */
-static inline void lv_textarea_set_sb_mode(lv_obj_t * ta, lv_sb_mode_t mode)
+static inline void lv_textarea_set_sb_mode(lv_obj_t * ta, lv_scrlbar_mode_t mode)
 {
     lv_page_set_scrlbar_mode(ta, mode);
 }
@@ -350,7 +350,7 @@ uint16_t lv_textarea_get_max_length(lv_obj_t * ta);
  * @param ta pointer to a text area object
  * @return scrollbar mode from 'lv_page_sb_mode_t' enum
  */
-static inline lv_sb_mode_t lv_textarea_get_sb_mode(const lv_obj_t * ta)
+static inline lv_scrlbar_mode_t lv_textarea_get_sb_mode(const lv_obj_t * ta)
 {
     return lv_page_get_sb_mode(ta);
 }

src/lv_widgets/lv_win.c

@@ -95,7 +95,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy)
 
         ext->page = lv_page_create(new_win, NULL);
         lv_obj_add_protect(ext->page, LV_PROTECT_PARENT);
-        lv_page_set_scrlbar_mode(ext->page, LV_SB_MODE_AUTO);
+        lv_page_set_scrlbar_mode(ext->page, LV_SCRLBAR_MODE_AUTO);
         lv_obj_clean_style_list(ext->page, LV_PAGE_PART_BG);
 
         /*Create a holder for the header*/
@@ -272,7 +272,7 @@ void lv_win_set_layout(lv_obj_t * win, lv_layout_t layout)
  * @param win pointer to a window object
  * @param sb_mode the new scroll bar mode from  'lv_sb_mode_t'
  */
-void lv_win_set_sb_mode(lv_obj_t * win, lv_sb_mode_t sb_mode)
+void lv_win_set_sb_mode(lv_obj_t * win, lv_scrlbar_mode_t sb_mode)
 {
     LV_ASSERT_OBJ(win, LV_OBJX_NAME);
 
@@ -383,7 +383,7 @@ lv_layout_t lv_win_get_layout(lv_obj_t * win)
  * @param win pointer to a window object
  * @return the scroll bar mode of the window (from 'lv_sb_mode_t')
  */
-lv_sb_mode_t lv_win_get_sb_mode(lv_obj_t * win)
+lv_scrlbar_mode_t lv_win_get_sb_mode(lv_obj_t * win)
 {
     LV_ASSERT_OBJ(win, LV_OBJX_NAME);
 

src/lv_widgets/lv_win.h

@@ -143,7 +143,7 @@ void lv_win_set_layout(lv_obj_t * win, lv_layout_t layout);
  * @param win pointer to a window object
  * @param sb_mode the new scroll bar mode from  'lv_sb_mode_t'
  */
-void lv_win_set_sb_mode(lv_obj_t * win, lv_sb_mode_t sb_mode);
+void lv_win_set_sb_mode(lv_obj_t * win, lv_scrlbar_mode_t sb_mode);
 
 /**
  * Set focus animation duration on `lv_win_focus()`
@@ -211,7 +211,7 @@ lv_layout_t lv_win_get_layout(lv_obj_t * win);
  * @param win pointer to a window object
  * @return the scroll bar mode of the window (from 'lv_sb_mode_t')
  */
-lv_sb_mode_t lv_win_get_sb_mode(lv_obj_t * win);
+lv_scrlbar_mode_t lv_win_get_sb_mode(lv_obj_t * win);
 
 /**
  * Get focus animation duration