fix(formatting): various improvements (#2028)

* fix(formatting): Remove the duplicated space

* fix(formatting): Remove the duplicated 'the'

* fix(spell): run codespell -w for the code base
This commit is contained in:
Xiang Xiao
2021-01-17 06:03:31 -08:00
committed by GitHub
parent 873551bb5e
commit c9b97feea8
95 changed files with 243 additions and 243 deletions
+10 -10
View File
@@ -6,7 +6,7 @@
- fix(cpicker) fix division by zero - fix(cpicker) fix division by zero
- fix(dropdown) fix selecting options after the last one - fix(dropdown) fix selecting options after the last one
- fix(msgbox) use the animation time provided - fix(msgbox) use the animation time provided
- fix(gpu_nxp_pxp) fix incorrent define name - fix(gpu_nxp_pxp) fix incorrect define name
- fix(indev) don't leave edit mode if there is only one object in the group - fix(indev) don't leave edit mode if there is only one object in the group
@@ -14,7 +14,7 @@
### New features ### New features
- feat(chart) add lv_chart_remove_series and lv_chart_hide_series - feat(chart) add lv_chart_remove_series and lv_chart_hide_series
- feat(img_cahce) allow disabling image cacheing - feat(img_cahce) allow disabling image caching
- calendar: make get_day_of_week() public - calendar: make get_day_of_week() public
- Added support for Zephyr integration - Added support for Zephyr integration
@@ -56,7 +56,7 @@
- fix reference to LV_DRAW_BUF_MAX_NUM in lv_mem.c - fix reference to LV_DRAW_BUF_MAX_NUM in lv_mem.c
- fix(polygon draw) join adjacent points if they are on the same coordinate - fix(polygon draw) join adjacent points if they are on the same coordinate
- fix(linemeter) fix invalidation when setting new value - fix(linemeter) fix invalidation when setting new value
- fix(table) add missing invalidation when changeing cell type - fix(table) add missing invalidation when changing cell type
- refactor(roller) rename LV_ROLLER_MODE_INIFINITE -> LV_ROLLER_MODE_INFINITE - refactor(roller) rename LV_ROLLER_MODE_INIFINITE -> LV_ROLLER_MODE_INFINITE
## v7.7.2 (17.11.2020) ## v7.7.2 (17.11.2020)
@@ -66,7 +66,7 @@
- fix(arc) fix and improve arc dragging - fix(arc) fix and improve arc dragging
- label: Repair calculate back `dot` character logical error which cause infinite loop. - label: Repair calculate back `dot` character logical error which cause infinite loop.
- fix(theme_material): remove the bottom border from tabview header - fix(theme_material): remove the bottom border from tabview header
- fix(imgbtn) guess a the closest availabe state with valid src - fix(imgbtn) guess a the closest available state with valid src
- fix(spinbox) update cursor position in lv_spinbox_set_step - fix(spinbox) update cursor position in lv_spinbox_set_step
## v7.7.1 (03.11.2020) ## v7.7.1 (03.11.2020)
@@ -83,7 +83,7 @@
- Allow max. 16 cell types for table - Allow max. 16 cell types for table
- Add `lv_table_set_text_fmt()` - Add `lv_table_set_text_fmt()`
- Use margin on calendar header to set distances and padding to the size of the header - Use margin on calendar header to set distances and padding to the size of the header
- Add `text_sel_bg` style proeprty - Add `text_sel_bg` style property
### Bugfixes ### Bugfixes
- Theme update to support text selection background - Theme update to support text selection background
@@ -123,7 +123,7 @@
- Add 10px and 8ox built in fonts - Add 10px and 8ox built in fonts
### Bugfixes ### Bugfixes
- Fix unexpeted DEFOCUS on lv_page when clicking to bg after the scrollable - Fix unexpected DEFOCUS on lv_page when clicking to bg after the scrollable
- Fix `lv_obj_del` and `lv_obj_clean` if the children list changed during deletion. - Fix `lv_obj_del` and `lv_obj_clean` if the children list changed during deletion.
- Adjust button matrix button width to include padding when spanning multiple units. - Adjust button matrix button width to include padding when spanning multiple units.
- Add rounding to btnmatrix line height calculation - Add rounding to btnmatrix line height calculation
@@ -138,10 +138,10 @@ The main new features of v7.4 are run-time font loading, style caching and arc k
### New features ### New features
- Add `lv_font_load()` function - Loads a `lv_font_t` object from a binary font file - Add `lv_font_load()` function - Loads a `lv_font_t` object from a binary font file
- Add `lv_font_free()` function - Frees the memory allocated by the `lv_font_load()` function - Add `lv_font_free()` function - Frees the memory allocated by the `lv_font_load()` function
- Add style caching to reduce acces time of properties with default value - Add style caching to reduce access time of properties with default value
- arc: add set value by click feature - arc: add set value by click feature
- arc: add `LV_ARC_PART_KNOB` similarly to slider - arc: add `LV_ARC_PART_KNOB` similarly to slider
- send gestures even if the the obejct was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. - send gestures event if the object was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function.
### Bugfixes ### Bugfixes
- Fix color bleeding on border drawing - Fix color bleeding on border drawing
@@ -225,7 +225,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k
- Add lv_btnmatrix_set/get_align capability - Add lv_btnmatrix_set/get_align capability
- DMA2D: Remove dependency on ST CubeMX HAL - DMA2D: Remove dependency on ST CubeMX HAL
- Added `max_used` propriety to `lv_mem_monitor_t` struct - Added `max_used` propriety to `lv_mem_monitor_t` struct
- In `lv_init` test if the the strings are UTF-8 encoded. - In `lv_init` test if the strings are UTF-8 encoded.
- Add `user_data` to themes - Add `user_data` to themes
- Add LV_BIG_ENDIAN_SYSTEM flag to lv_conf.h in order to fix displaying images on big endian systems. - Add LV_BIG_ENDIAN_SYSTEM flag to lv_conf.h in order to fix displaying images on big endian systems.
- Add inline function lv_checkbox_get_state(const lv_obj_t * cb) to extend the checkbox functionality. - Add inline function lv_checkbox_get_state(const lv_obj_t * cb) to extend the checkbox functionality.
@@ -279,7 +279,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k
- Remove memcpy from `lv_ll` (caused issues with some optimization settings) - Remove memcpy from `lv_ll` (caused issues with some optimization settings)
- `lv_chart` fix X tick drawing - `lv_chart` fix X tick drawing
- Fix vertical dashed line drawing - Fix vertical dashed line drawing
- Some additonal minor fixes and formattings - Some additional minor fixes and formattings
## v7.0.0 (18.05.2020) ## v7.0.0 (18.05.2020)
+1 -1
View File
@@ -258,7 +258,7 @@ menu "LVGL configuration"
menu "Image decoder and cache" menu "Image decoder and cache"
config LV_IMG_CF_INDEXED config LV_IMG_CF_INDEXED
bool "Enable indexed (pallete) images." bool "Enable indexed (palette) images."
default y if !LV_CONF_MINIMAL default y if !LV_CONF_MINIMAL
config LV_IMG_CF_ALPHA config LV_IMG_CF_ALPHA
bool "Enable alpha indexed images." bool "Enable alpha indexed images."
+4 -4
View File
@@ -27,7 +27,7 @@ Planned to November/December 2020
- Simplified File system interface ([feat/new_fs_api](https://github.com/lvgl/lvgl/tree/feat/new-fs-api) branch) to make porting easier - Simplified File system interface ([feat/new_fs_api](https://github.com/lvgl/lvgl/tree/feat/new-fs-api) branch) to make porting easier
- Work in progress - Work in progress
- Remove the align parameter from `lv_canvas_draw_text` - Remove the align parameter from `lv_canvas_draw_text`
- Make the copy paramter obsolate in create functions - Make the copy parameter obsolate in create functions
- Optimize and simplifie styles [#1832](https://github.com/lvgl/lvgl/issues/1832) - Optimize and simplifie styles [#1832](https://github.com/lvgl/lvgl/issues/1832)
- Use a more generic inheritenace [#1919](https://github.com/lvgl/lvgl/issues/1919) - Use a more generic inheritenace [#1919](https://github.com/lvgl/lvgl/issues/1919)
@@ -39,7 +39,7 @@ Planned to November/December 2020
## v9 ## v9
- Simplify `group`s. Discussion is [here](https://forum.lvgl.io/t/lv-group-tabindex/2927/3). - Simplify `group`s. Discussion is [here](https://forum.lvgl.io/t/lv-group-tabindex/2927/3).
- Consider direct binary font format support - Consider direct binary font format support
- Optimize line and cirle drawing and masking - Optimize line and circle drawing and masking
- Reconsider color format management for run time color format setting, and custom color format usage. (Also [RGB888](https://github.com/lvgl/lvgl/issues/1722)) - Reconsider color format management for run time color format setting, and custom color format usage. (Also [RGB888](https://github.com/lvgl/lvgl/issues/1722))
- 9-patch support for `lv_imgbtn`. - 9-patch support for `lv_imgbtn`.
- Handle stride. See [#1858](https://github.com/lvgl/lvgl/issues/1858) - Handle stride. See [#1858](https://github.com/lvgl/lvgl/issues/1858)
@@ -51,10 +51,10 @@ Planned to November/December 2020
- lv_mem_alloc_aligned(size, align) - lv_mem_alloc_aligned(size, align)
- Text node. See [#1701](https://github.com/lvgl/lvgl/issues/1701#issuecomment-699479408) - Text node. See [#1701](https://github.com/lvgl/lvgl/issues/1701#issuecomment-699479408)
- CPP binding. See [Forum](https://forum.lvgl.io/t/is-it-possible-to-officially-support-optional-cpp-api/2736) - CPP binding. See [Forum](https://forum.lvgl.io/t/is-it-possible-to-officially-support-optional-cpp-api/2736)
- Optmize font decompression - Optimize font decompression
- Switch to RGBA colors in styles - Switch to RGBA colors in styles
- Need coverage report for tests - Need coverage report for tests
- Need static analize (via coverity.io or somehing else) - Need static analyze (via coverity.io or somehing else)
- Support dot_begin and dot_middle long modes for labels - Support dot_begin and dot_middle long modes for labels
- Add new label alignment modes. [#1656](https://github.com/lvgl/lvgl/issues/1656) - Add new label alignment modes. [#1656](https://github.com/lvgl/lvgl/issues/1656)
- Support larger images: [#1892](https://github.com/lvgl/lvgl/issues/1892) - Support larger images: [#1892](https://github.com/lvgl/lvgl/issues/1892)
+1 -1
View File
@@ -55,7 +55,7 @@ void lv_port_disp_init(void)
*----------------------------*/ *----------------------------*/
/* LVGL requires a buffer where it internally draws the widgets. /* LVGL requires a buffer where it internally draws the widgets.
* Later this buffer will passed your display drivers `flush_cb` to copy its content to your dispay. * Later this buffer will passed your display drivers `flush_cb` to copy its content to your display.
* The buffer has to be greater than 1 display row * The buffer has to be greater than 1 display row
* *
* There are three buffering configurations: * There are three buffering configurations:
+1 -1
View File
@@ -117,7 +117,7 @@ void lv_port_fs_init(void)
/* Initialize your Storage device and File system. */ /* Initialize your Storage device and File system. */
static void fs_init(void) static void fs_init(void)
{ {
/*E.g. for FatFS initalize the SD card and FatFS itself*/ /*E.g. for FatFS initialize the SD card and FatFS itself*/
/*You code here*/ /*You code here*/
} }
+1 -1
View File
@@ -14,7 +14,7 @@ def cmd(c, ask_on_err = True):
if r: if r:
print("### Error: " + str(r)) print("### Error: " + str(r))
if ask_on_err: if ask_on_err:
input("Press Enter to continue exectution...") input("Press Enter to continue execution...")
def define_set(fn, name, value): def define_set(fn, name, value):
print("In " + fn + " set " + name + " to " + value) print("In " + fn + " set " + name + " to " + value)
+1 -1
View File
@@ -47,7 +47,7 @@ if __name__ == '__main__':
# if(len(sys.argv) != 2): # if(len(sys.argv) != 2):
# print("Missing argument. Usage ./release.py bugfix | minor | major") # print("Missing argument. Usage ./release.py bugfix | minor | major")
# print("Use minor by deafult") # print("Use minor by default")
# else: # else:
# dev_prepare = sys.argv[1] # dev_prepare = sys.argv[1]
+3 -3
View File
@@ -10,7 +10,7 @@ import com
def make(repo_path, auto_push = False): def make(repo_path, auto_push = False):
os.chdir("./" + repo_path) os.chdir("./" + repo_path)
com.cmd('git checkout master') com.cmd('git checkout master')
print("Upadte lvgl"); print("Update lvgl");
os.chdir("./lvgl") os.chdir("./lvgl")
com.cmd("git checkout master") com.cmd("git checkout master")
com.cmd("git pull origin --tags") com.cmd("git pull origin --tags")
@@ -37,11 +37,11 @@ def make(repo_path, auto_push = False):
com.define_set("lv_conf.h", str(key), str(val)) com.define_set("lv_conf.h", str(key), str(val))
if os.path.exists("lv_examples"): if os.path.exists("lv_examples"):
print("Upadte lv_examples"); print("Update lv_examples");
com.cmd("cd lv_examples; git co " + release_br + "; git pull origin " + release_br) com.cmd("cd lv_examples; git co " + release_br + "; git pull origin " + release_br)
if os.path.exists("lv_drivers"): if os.path.exists("lv_drivers"):
print("upadte lv_drivers"); print("update lv_drivers");
com.cmd("cd lv_drivers " + release_br + "; git pull origin " + release_br) com.cmd("cd lv_drivers " + release_br + "; git pull origin " + release_br)
msg = 'Update to ' + ver_str msg = 'Update to ' + ver_str
+2 -2
View File
@@ -81,7 +81,7 @@ lv_group_t * lv_group_create(void)
*/ */
void lv_group_del(lv_group_t * group) void lv_group_del(lv_group_t * group)
{ {
/*Defocus the the currently focused object*/ /*Defocus the currently focused object*/
if(group->obj_focus != NULL) { if(group->obj_focus != NULL) {
(*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL); (*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
lv_obj_invalidate(*group->obj_focus); lv_obj_invalidate(*group->obj_focus);
@@ -185,7 +185,7 @@ void lv_group_remove_obj(lv_obj_t * obj)
*/ */
void lv_group_remove_all_objs(lv_group_t * group) void lv_group_remove_all_objs(lv_group_t * group)
{ {
/*Defocus the the currently focused object*/ /*Defocus the currently focused object*/
if(group->obj_focus != NULL) { if(group->obj_focus != NULL) {
(*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL); (*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
lv_obj_invalidate(*group->obj_focus); lv_obj_invalidate(*group->obj_focus);
+1 -1
View File
@@ -597,7 +597,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
} }
/* Save the last keys before anything else. /* Save the last keys before anything else.
* They need to be already saved if the the function returns for any reason*/ * They need to be already saved if the function returns for any reason*/
lv_indev_state_t last_state = i->proc.types.keypad.last_state; lv_indev_state_t last_state = i->proc.types.keypad.last_state;
i->proc.types.keypad.last_state = data->state; i->proc.types.keypad.last_state = data->state;
i->proc.types.keypad.last_key = data->key; i->proc.types.keypad.last_key = data->key;
+4 -4
View File
@@ -1222,7 +1222,7 @@ void lv_obj_remove_style(lv_obj_t * obj, uint8_t part, lv_style_t * style)
* Release all used memories and cancel pending related transitions. * Release all used memories and cancel pending related transitions.
* Typically used in `LV_SIGN_CLEAN_UP. * Typically used in `LV_SIGN_CLEAN_UP.
* @param obj pointer to an object * @param obj pointer to an object
* @param part the part of the object which style list should be reseted. * @param part the part of the object which style list should be reset.
* E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB`
*/ */
void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part) void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part)
@@ -1244,7 +1244,7 @@ void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part)
* Release all used memories and cancel pending related transitions. * Release all used memories and cancel pending related transitions.
* Also notifies the object about the style change. * Also notifies the object about the style change.
* @param obj pointer to an object * @param obj pointer to an object
* @param part the part of the object which style list should be reseted. * @param part the part of the object which style list should be reset.
* E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB`
*/ */
void lv_obj_reset_style_list(lv_obj_t * obj, uint8_t part) void lv_obj_reset_style_list(lv_obj_t * obj, uint8_t part)
@@ -2388,7 +2388,7 @@ lv_coord_t lv_obj_get_width_margin(lv_obj_t * obj)
* Set that width reduced by the left and right padding of the parent. * Set that width reduced by the left and right padding of the parent.
* @param obj pointer to an object * @param obj pointer to an object
* @param div indicates how many columns are assumed. * @param div indicates how many columns are assumed.
* If 1 the width will be set the the parent's width * If 1 the width will be set the parent's width
* If 2 only half parent width - inner padding of the parent * If 2 only half parent width - inner padding of the parent
* If 3 only third parent width - 2 * inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent
* @param span how many columns are combined * @param span how many columns are combined
@@ -2409,7 +2409,7 @@ lv_coord_t lv_obj_get_width_grid(lv_obj_t * obj, uint8_t div, uint8_t span)
* Get that height reduced by the top and bottom padding of the parent. * Get that height reduced by the top and bottom padding of the parent.
* @param obj pointer to an object * @param obj pointer to an object
* @param div indicates how many rows are assumed. * @param div indicates how many rows are assumed.
* If 1 the height will be set the the parent's height * If 1 the height will be set the parent's height
* If 2 only half parent height - inner padding of the parent * If 2 only half parent height - inner padding of the parent
* If 3 only third parent height - 2 * inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent
* @param span how many rows are combined * @param span how many rows are combined
+5 -5
View File
@@ -577,7 +577,7 @@ void lv_obj_remove_style(lv_obj_t * obj, uint8_t part, lv_style_t * style);
* Release all used memories and cancel pending related transitions. * Release all used memories and cancel pending related transitions.
* Typically used in `LV_SIGN_CLEAN_UP. * Typically used in `LV_SIGN_CLEAN_UP.
* @param obj pointer to an object * @param obj pointer to an object
* @param part the part of the object which style list should be reseted. * @param part the part of the object which style list should be reset.
* E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB`
*/ */
void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part); void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part);
@@ -587,7 +587,7 @@ void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part);
* Release all used memories and cancel pending related transitions. * Release all used memories and cancel pending related transitions.
* Also notifies the object about the style change. * Also notifies the object about the style change.
* @param obj pointer to an object * @param obj pointer to an object
* @param part the part of the object which style list should be reseted. * @param part the part of the object which style list should be reset.
* E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB`
*/ */
void lv_obj_reset_style_list(lv_obj_t * obj, uint8_t part); void lv_obj_reset_style_list(lv_obj_t * obj, uint8_t part);
@@ -676,7 +676,7 @@ void _lv_obj_set_style_local_ptr(lv_obj_t * obj, uint8_t type, lv_style_property
bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop); bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop);
/** /**
* Enable/disable the use of style cahche for an object * Enable/disable the use of style cache for an object
* @param obj pointer to an object * @param obj pointer to an object
* @param dis true: disable; false: enable (re-enable) * @param dis true: disable; false: enable (re-enable)
*/ */
@@ -1055,7 +1055,7 @@ lv_coord_t lv_obj_get_width_margin(lv_obj_t * obj);
* Take paddings into account. * Take paddings into account.
* @param obj pointer to an object * @param obj pointer to an object
* @param div indicates how many columns are assumed. * @param div indicates how many columns are assumed.
* If 1 the width will be set the the parent's width * If 1 the width will be set the parent's width
* If 2 only half parent width - inner padding of the parent * If 2 only half parent width - inner padding of the parent
* If 3 only third parent width - 2 * inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent
* @param span how many columns are combined * @param span how many columns are combined
@@ -1068,7 +1068,7 @@ lv_coord_t lv_obj_get_width_grid(lv_obj_t * obj, uint8_t div, uint8_t span);
* Take paddings into account. * Take paddings into account.
* @param obj pointer to an object * @param obj pointer to an object
* @param div indicates how many rows are assumed. * @param div indicates how many rows are assumed.
* If 1 the height will be set the the parent's height * If 1 the height will be set the parent's height
* If 2 only half parent height - inner padding of the parent * If 2 only half parent height - inner padding of the parent
* If 3 only third parent height - 2 * inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent
* @param span how many rows are combined * @param span how many rows are combined
+1 -1
View File
@@ -74,7 +74,7 @@ void _lv_refr_init(void)
/** /**
* Redraw the invalidated areas now. * Redraw the invalidated areas now.
* Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process * Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process
* can prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process * can prevent the call of `lv_task_handler`. In this case if the GUI is updated in the process
* (e.g. progress bar) this function can be called when the screen should be updated. * (e.g. progress bar) this function can be called when the screen should be updated.
* @param disp pointer to display to refresh. NULL to refresh all displays. * @param disp pointer to display to refresh. NULL to refresh all displays.
*/ */
+1 -1
View File
@@ -50,7 +50,7 @@ void _lv_refr_init(void);
/** /**
* Redraw the invalidated areas now. * Redraw the invalidated areas now.
* Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process * Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process
* can prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process * can prevent the call of `lv_task_handler`. In this case if the GUI is updated in the process
* (e.g. progress bar) this function can be called when the screen should be updated. * (e.g. progress bar) this function can be called when the screen should be updated.
* @param disp pointer to display to refresh. NULL to refresh all displays. * @param disp pointer to display to refresh. NULL to refresh all displays.
*/ */
+1 -1
View File
@@ -188,7 +188,7 @@ void lv_style_list_copy(lv_style_list_t * list_dest, const lv_style_list_t * lis
/** /**
* Add a style to a style list. * Add a style to a style list.
* Only the the style pointer will be saved so the shouldn't be a local variable. * Only the style pointer will be saved so the shouldn't be a local variable.
* (It should be static, global or dynamically allocated) * (It should be static, global or dynamically allocated)
* @param list pointer to a style list * @param list pointer to a style list
* @param style pointer to a style to add * @param style pointer to a style to add
+1 -1
View File
@@ -287,7 +287,7 @@ void lv_style_list_copy(lv_style_list_t * list_dest, const lv_style_list_t * lis
/** /**
* Add a style to a style list. * Add a style to a style list.
* Only the the style pointer will be saved so the shouldn't be a local variable. * Only the style pointer will be saved so the shouldn't be a local variable.
* (It should be static, global or dynamically allocated) * (It should be static, global or dynamically allocated)
* @param list pointer to a style list * @param list pointer to a style list
* @param style pointer to a style to add * @param style pointer to a style to add
+1 -1
View File
@@ -411,7 +411,7 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_letter(const lv_point_t * pos_p, const
lv_font_glyph_dsc_t g; lv_font_glyph_dsc_t g;
bool g_ret = lv_font_get_glyph_dsc(font_p, &g, letter, '\0'); bool g_ret = lv_font_get_glyph_dsc(font_p, &g, letter, '\0');
if(g_ret == false) { if(g_ret == false) {
/* Add waring if the dsc is not found /* Add warning if the dsc is not found
* but do not print warning for non printable ASCII chars (e.g. '\n')*/ * but do not print warning for non printable ASCII chars (e.g. '\n')*/
if(letter >= 0x20) { if(letter >= 0x20) {
LV_LOG_WARN("lv_draw_letter: glyph dsc. not found"); LV_LOG_WARN("lv_draw_letter: glyph dsc. not found");
+2 -2
View File
@@ -115,7 +115,7 @@ typedef struct {
typedef struct { typedef struct {
/*To get a kern value of two code points: /*To get a kern value of two code points:
1. Get the `glyph_id_left` and `glyph_id_right` from `lv_font_fmt_txt_cmap_t 1. Get the `glyph_id_left` and `glyph_id_right` from `lv_font_fmt_txt_cmap_t
2 for(i = 0; i < pair_cnt * 2; i+2) 2. for(i = 0; i < pair_cnt * 2; i+2)
if(gylph_ids[i] == glyph_id_left && if(gylph_ids[i] == glyph_id_left &&
gylph_ids[i+1] == glyph_id_right) gylph_ids[i+1] == glyph_id_right)
return values[i / 2]; return values[i / 2];
@@ -130,7 +130,7 @@ typedef struct {
typedef struct { typedef struct {
/*To get a kern value of two code points: /*To get a kern value of two code points:
1. Get the `glyph_id_left` and `glyph_id_right` from `lv_font_fmt_txt_cmap_t 1. Get the `glyph_id_left` and `glyph_id_right` from `lv_font_fmt_txt_cmap_t
2 Get the class of the left and right glyphs as `left_class` and `right_class` 2. Get the class of the left and right glyphs as `left_class` and `right_class`
left_class = left_class_mapping[glyph_id_left]; left_class = left_class_mapping[glyph_id_left];
right_class = right_class_mapping[glyph_id_right]; right_class = right_class_mapping[glyph_id_right];
3. value = class_pair_values[(left_class-1)*right_class_cnt + (right_class-1)] 3. value = class_pair_values[(left_class-1)*right_class_cnt + (right_class-1)]
+1 -1
View File
@@ -78,7 +78,7 @@ typedef struct _disp_drv_t {
uint32_t rotated : 1; /**< 1: turn the display by 90 degree. @warning Does not update coordinates for you!*/ uint32_t rotated : 1; /**< 1: turn the display by 90 degree. @warning Does not update coordinates for you!*/
#if LV_COLOR_SCREEN_TRANSP #if LV_COLOR_SCREEN_TRANSP
/**Handle if the the screen doesn't have a solid (opa == LV_OPA_COVER) background. /**Handle if the screen doesn't have a solid (opa == LV_OPA_COVER) background.
* Use only if required because it's slower.*/ * Use only if required because it's slower.*/
uint32_t screen_transp : 1; uint32_t screen_transp : 1;
#endif #endif
+1 -1
View File
@@ -135,7 +135,7 @@ bool _lv_indev_read(lv_indev_t * indev, lv_indev_data_t * data)
data->point.x = indev->proc.types.pointer.act_point.x; data->point.x = indev->proc.types.pointer.act_point.x;
data->point.y = indev->proc.types.pointer.act_point.y; data->point.y = indev->proc.types.pointer.act_point.y;
} }
/*Similarly set at least the last key in case of the the user doesn't set it on release*/ /*Similarly set at least the last key in case of the user doesn't set it on release*/
else if(indev->driver.type == LV_INDEV_TYPE_KEYPAD) { else if(indev->driver.type == LV_INDEV_TYPE_KEYPAD) {
data->key = indev->proc.types.keypad.last_key; data->key = indev->proc.types.keypad.last_key;
} }
+1 -1
View File
@@ -456,7 +456,7 @@ static void anim_task(lv_task_t * param)
anim_list_changed = false; anim_list_changed = false;
if(!a->has_run) { if(!a->has_run) {
a->has_run = 1; /*The list readying might be reseted so need to know which anim has run already*/ a->has_run = 1; /*The list readying might be reset so need to know which anim has run already*/
/*The animation will run now for the first time. Call `start_cb`*/ /*The animation will run now for the first time. Call `start_cb`*/
int32_t new_act_time = a->act_time + elaps; int32_t new_act_time = a->act_time + elaps;
+2 -2
View File
@@ -131,7 +131,7 @@ lv_bidi_dir_t _lv_bidi_detect_base_dir(const char * txt)
* @param len length of the line in character count * @param len length of the line in character count
* @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL`
* @param visual_pos the visual character position which logical position should be get * @param visual_pos the visual character position which logical position should be get
* @param is_rtl tell the the char at `visual_pos` is RTL or LTR context * @param is_rtl tell the char at `visual_pos` is RTL or LTR context
* @return the logical character position * @return the logical character position
*/ */
uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir, uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir,
@@ -168,7 +168,7 @@ uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_
* @param len length of the line in character count * @param len length of the line in character count
* @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL`
* @param logical_pos the logical character position which visual position should be get * @param logical_pos the logical character position which visual position should be get
* @param is_rtl tell the the char at `logical_pos` is RTL or LTR context * @param is_rtl tell the char at `logical_pos` is RTL or LTR context
* @return the visual character position * @return the visual character position
*/ */
uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t len, lv_bidi_dir_t base_dir, uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t len, lv_bidi_dir_t base_dir,
+2 -2
View File
@@ -72,7 +72,7 @@ lv_bidi_dir_t _lv_bidi_detect_base_dir(const char * txt);
* @param len length of the line in character count * @param len length of the line in character count
* @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL`
* @param visual_pos the visual character position which logical position should be get * @param visual_pos the visual character position which logical position should be get
* @param is_rtl tell the the char at `visual_pos` is RTL or LTR context * @param is_rtl tell the char at `visual_pos` is RTL or LTR context
* @return the logical character position * @return the logical character position
*/ */
uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir, uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir,
@@ -87,7 +87,7 @@ uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_
* @param len length of the line in character count * @param len length of the line in character count
* @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL`
* @param logical_pos the logical character position which visual position should be get * @param logical_pos the logical character position which visual position should be get
* @param is_rtl tell the the char at `logical_pos` is RTL or LTR context * @param is_rtl tell the char at `logical_pos` is RTL or LTR context
* @return the visual character position * @return the visual character position
*/ */
uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t len, lv_bidi_dir_t base_dir, uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t len, lv_bidi_dir_t base_dir,
+1 -1
View File
@@ -150,7 +150,7 @@ void * _lv_ll_ins_tail(lv_ll_t * ll_p)
/** /**
* Remove the node 'node_p' from 'll_p' linked list. * Remove the node 'node_p' from 'll_p' linked list.
* It does not free the the memory of node. * It does not free the memory of node.
* @param ll_p pointer to the linked list of 'node_p' * @param ll_p pointer to the linked list of 'node_p'
* @param node_p pointer to node in 'll_p' linked list * @param node_p pointer to node in 'll_p' linked list
*/ */
+1 -1
View File
@@ -71,7 +71,7 @@ void * _lv_ll_ins_tail(lv_ll_t * ll_p);
/** /**
* Remove the node 'node_p' from 'll_p' linked list. * Remove the node 'node_p' from 'll_p' linked list.
* It does not free the the memory of node. * It does not free the memory of node.
* @param ll_p pointer to the linked list of 'node_p' * @param ll_p pointer to the linked list of 'node_p'
* @param node_p pointer to node in 'll_p' linked list * @param node_p pointer to node in 'll_p' linked list
*/ */
+2 -2
View File
@@ -121,7 +121,7 @@ void _lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t
size_res->y += line_space; size_res->y += line_space;
} }
/*Calculate the the longest line*/ /*Calculate the longest line*/
lv_coord_t act_line_length = _lv_txt_get_width(&text[line_start], new_line_start - line_start, font, letter_space, lv_coord_t act_line_length = _lv_txt_get_width(&text[line_start], new_line_start - line_start, font, letter_space,
flag); flag);
@@ -225,7 +225,7 @@ static uint32_t lv_txt_get_next_word(const char * txt, const lv_font_t * font,
/*Check for new line chars and breakchars*/ /*Check for new line chars and breakchars*/
if(letter == '\n' || letter == '\r' || is_break_char(letter)) { if(letter == '\n' || letter == '\r' || is_break_char(letter)) {
/* Update the output width on the first character if it fits. /* Update the output width on the first character if it fits.
* Must do this here incase first letter is a break character. */ * Must do this here in case first letter is a break character. */
if(i == 0 && break_index == NO_BREAK_FOUND && word_w_ptr != NULL) *word_w_ptr = cur_w; if(i == 0 && break_index == NO_BREAK_FOUND && word_w_ptr != NULL) *word_w_ptr = cur_w;
word_len--; word_len--;
break; break;
+1 -1
View File
@@ -210,7 +210,7 @@ static uint32_t lv_ap_get_char_index(uint16_t c)
if(c == (ap_chars_map[i].char_offset + LV_AP_ALPHABET_BASE_CODE)) if(c == (ap_chars_map[i].char_offset + LV_AP_ALPHABET_BASE_CODE))
return i; return i;
else if(c == ap_chars_map[i].char_end_form //is it an End form else if(c == ap_chars_map[i].char_end_form //is it an End form
|| c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Begining form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Beginning form
|| c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_middle_form_offset) //is it a middle form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_middle_form_offset) //is it a middle form
|| c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) { //is it an isolated form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) { //is it an isolated form
return i; return i;
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_CONT == 0 #if LV_USE_CONT == 0
#error "lv_btn: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1) " #error "lv_btn: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1)"
#endif #endif
#include "lv_cont.h" #include "lv_cont.h"
+4 -4
View File
@@ -476,7 +476,7 @@ bool lv_btnmatrix_get_recolor(const lv_obj_t * btnm)
/** /**
* Get the index of the lastly "activated" button by the user (pressed, released etc) * Get the index of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb` to get the text of the button, check if hidden etc. * Useful in the `event_cb` to get the text of the button, check if hidden etc.
* @param btnm pointer to button matrix object * @param btnm pointer to button matrix object
* @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset)
*/ */
@@ -490,7 +490,7 @@ uint16_t lv_btnmatrix_get_active_btn(const lv_obj_t * btnm)
/** /**
* Get the text of the lastly "activated" button by the user (pressed, released etc) * Get the text of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb` * Useful in the `event_cb`
* @param btnm pointer to button matrix object * @param btnm pointer to button matrix object
* @return text of the last released button (NULL: if unset) * @return text of the last released button (NULL: if unset)
*/ */
@@ -1037,7 +1037,7 @@ static lv_res_t lv_btnmatrix_signal(lv_obj_t * btnm, lv_signal_t sign, void * pa
} }
else if(c == LV_KEY_DOWN) { else if(c == LV_KEY_DOWN) {
lv_style_int_t pad_inner = lv_obj_get_style_pad_inner(btnm, LV_BTNMATRIX_PART_BG); lv_style_int_t pad_inner = lv_obj_get_style_pad_inner(btnm, LV_BTNMATRIX_PART_BG);
/*Find the area below the the current*/ /*Find the area below the current*/
if(ext->btn_id_focused == LV_BTNMATRIX_BTN_NONE) { if(ext->btn_id_focused == LV_BTNMATRIX_BTN_NONE) {
ext->btn_id_focused = 0; ext->btn_id_focused = 0;
} }
@@ -1063,7 +1063,7 @@ static lv_res_t lv_btnmatrix_signal(lv_obj_t * btnm, lv_signal_t sign, void * pa
} }
else if(c == LV_KEY_UP) { else if(c == LV_KEY_UP) {
lv_style_int_t pad_inner = lv_obj_get_style_pad_inner(btnm, LV_BTNMATRIX_PART_BG); lv_style_int_t pad_inner = lv_obj_get_style_pad_inner(btnm, LV_BTNMATRIX_PART_BG);
/*Find the area below the the current*/ /*Find the area below the current*/
if(ext->btn_id_focused == LV_BTNMATRIX_BTN_NONE) { if(ext->btn_id_focused == LV_BTNMATRIX_BTN_NONE) {
ext->btn_id_focused = 0; ext->btn_id_focused = 0;
} }
+2 -2
View File
@@ -198,7 +198,7 @@ bool lv_btnmatrix_get_recolor(const lv_obj_t * btnm);
/** /**
* Get the index of the lastly "activated" button by the user (pressed, released etc) * Get the index of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb` to get the text of the button, check if hidden etc. * Useful in the `event_cb` to get the text of the button, check if hidden etc.
* @param btnm pointer to button matrix object * @param btnm pointer to button matrix object
* @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset)
*/ */
@@ -206,7 +206,7 @@ uint16_t lv_btnmatrix_get_active_btn(const lv_obj_t * btnm);
/** /**
* Get the text of the lastly "activated" button by the user (pressed, released etc) * Get the text of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb` * Useful in the `event_cb`
* @param btnm pointer to button matrix object * @param btnm pointer to button matrix object
* @return text of the last released button (NULL: if unset) * @return text of the last released button (NULL: if unset)
*/ */
+3 -3
View File
@@ -215,7 +215,7 @@ void lv_calendar_set_showed_date(lv_obj_t * calendar, lv_calendar_date_t * showe
} }
/** /**
* Set the the highlighted dates * Set the highlighted dates
* @param calendar pointer to a calendar object * @param calendar pointer to a calendar object
* @param highlighted pointer to an `lv_calendar_date_t` array containing the dates. ONLY A POINTER * @param highlighted pointer to an `lv_calendar_date_t` array containing the dates. ONLY A POINTER
* WILL BE SAVED! CAN'T BE LOCAL ARRAY. * WILL BE SAVED! CAN'T BE LOCAL ARRAY.
@@ -298,7 +298,7 @@ lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar)
} }
/** /**
* Get the the pressed date. * Get the pressed date.
* @param calendar pointer to a calendar object * @param calendar pointer to a calendar object
* @return pointer to an `lv_calendar_date_t` variable containing the pressed date. * @return pointer to an `lv_calendar_date_t` variable containing the pressed date.
* `NULL` if not date pressed (e.g. the header) * `NULL` if not date pressed (e.g. the header)
@@ -312,7 +312,7 @@ lv_calendar_date_t * lv_calendar_get_pressed_date(const lv_obj_t * calendar)
} }
/** /**
* Get the the highlighted dates * Get the highlighted dates
* @param calendar pointer to a calendar object * @param calendar pointer to a calendar object
* @return pointer to an `lv_calendar_date_t` array containing the dates. * @return pointer to an `lv_calendar_date_t` array containing the dates.
*/ */
+3 -3
View File
@@ -102,7 +102,7 @@ void lv_calendar_set_today_date(lv_obj_t * calendar, lv_calendar_date_t * today)
void lv_calendar_set_showed_date(lv_obj_t * calendar, lv_calendar_date_t * showed); void lv_calendar_set_showed_date(lv_obj_t * calendar, lv_calendar_date_t * showed);
/** /**
* Set the the highlighted dates * Set the highlighted dates
* @param calendar pointer to a calendar object * @param calendar pointer to a calendar object
* @param highlighted pointer to an `lv_calendar_date_t` array containing the dates. ONLY A POINTER * @param highlighted pointer to an `lv_calendar_date_t` array containing the dates. ONLY A POINTER
* WILL BE SAVED! CAN'T BE LOCAL ARRAY. * WILL BE SAVED! CAN'T BE LOCAL ARRAY.
@@ -147,7 +147,7 @@ lv_calendar_date_t * lv_calendar_get_today_date(const lv_obj_t * calendar);
lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar); lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar);
/** /**
* Get the the pressed date. * Get the pressed date.
* @param calendar pointer to a calendar object * @param calendar pointer to a calendar object
* @return pointer to an `lv_calendar_date_t` variable containing the pressed date. * @return pointer to an `lv_calendar_date_t` variable containing the pressed date.
* `NULL` if not date pressed (e.g. the header) * `NULL` if not date pressed (e.g. the header)
@@ -155,7 +155,7 @@ lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar);
lv_calendar_date_t * lv_calendar_get_pressed_date(const lv_obj_t * calendar); lv_calendar_date_t * lv_calendar_get_pressed_date(const lv_obj_t * calendar);
/** /**
* Get the the highlighted dates * Get the highlighted dates
* @param calendar pointer to a calendar object * @param calendar pointer to a calendar object
* @return pointer to an `lv_calendar_date_t` array containing the dates. * @return pointer to an `lv_calendar_date_t` array containing the dates.
*/ */
+2 -2
View File
@@ -19,11 +19,11 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_BTN == 0 #if LV_USE_BTN == 0
#error "lv_cb: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " #error "lv_cb: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)"
#endif #endif
#if LV_USE_LABEL == 0 #if LV_USE_LABEL == 0
#error "lv_cb: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " #error "lv_cb: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+1 -1
View File
@@ -508,7 +508,7 @@ static void lv_cont_layout_pretty(lv_obj_t * cont)
lv_coord_t pright = lv_obj_get_style_pad_right(cont, LV_CONT_PART_MAIN); lv_coord_t pright = lv_obj_get_style_pad_right(cont, LV_CONT_PART_MAIN);
lv_coord_t pinner = lv_obj_get_style_pad_inner(cont, LV_CONT_PART_MAIN); lv_coord_t pinner = lv_obj_get_style_pad_inner(cont, LV_CONT_PART_MAIN);
child_rc = child_rs; /*Initially the the row starter and closer is the same*/ child_rc = child_rs; /*Initially the row starter and closer is the same*/
while(child_rs != NULL) { while(child_rs != NULL) {
lv_coord_t h_row = 0; lv_coord_t h_row = 0;
lv_coord_t w_row = pleft + pright; /*The width is at least the left+right pad*/ lv_coord_t w_row = pleft + pright; /*The width is at least the left+right pad*/
+2 -2
View File
@@ -19,11 +19,11 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_PAGE == 0 #if LV_USE_PAGE == 0
#error "lv_ddlist: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " #error "lv_ddlist: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)"
#endif #endif
#if LV_USE_LABEL == 0 #if LV_USE_LABEL == 0
#error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " #error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
#endif #endif
#include "../lv_widgets/lv_page.h" #include "../lv_widgets/lv_page.h"
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_LINEMETER == 0 #if LV_USE_LINEMETER == 0
#error "lv_gauge: lv_linemeter is required. Enable it in lv_conf.h (LV_USE_LINEMETER 1) " #error "lv_gauge: lv_linemeter is required. Enable it in lv_conf.h (LV_USE_LINEMETER 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+1 -1
View File
@@ -11,7 +11,7 @@
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_LABEL == 0 #if LV_USE_LABEL == 0
#error "lv_img: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " #error "lv_img: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
#endif #endif
#include "../lv_misc/lv_debug.h" #include "../lv_misc/lv_debug.h"
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_BTN == 0 #if LV_USE_BTN == 0
#error "lv_imgbtn: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " #error "lv_imgbtn: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+2 -2
View File
@@ -19,11 +19,11 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_BTNMATRIX == 0 #if LV_USE_BTNMATRIX == 0
#error "lv_kb: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1) " #error "lv_kb: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1)"
#endif #endif
#if LV_USE_TEXTAREA == 0 #if LV_USE_TEXTAREA == 0
#error "lv_kb: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1) " #error "lv_kb: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+3 -3
View File
@@ -19,15 +19,15 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_PAGE == 0 #if LV_USE_PAGE == 0
#error "lv_list: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " #error "lv_list: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)"
#endif #endif
#if LV_USE_BTN == 0 #if LV_USE_BTN == 0
#error "lv_list: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " #error "lv_list: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)"
#endif #endif
#if LV_USE_LABEL == 0 #if LV_USE_LABEL == 0
#error "lv_list: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " #error "lv_list: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+2 -2
View File
@@ -344,7 +344,7 @@ const char * lv_msgbox_get_text(const lv_obj_t * mbox)
/** /**
* Get the index of the lastly "activated" button by the user (pressed, released etc) * Get the index of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb`. * Useful in the `event_cb`.
* @param mbox pointer to message box object * @param mbox pointer to message box object
* @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset)
*/ */
@@ -365,7 +365,7 @@ uint16_t lv_msgbox_get_active_btn(lv_obj_t * mbox)
/** /**
* Get the text of the lastly "activated" button by the user (pressed, released etc) * Get the text of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb`. * Useful in the `event_cb`.
* @param mbox pointer to message box object * @param mbox pointer to message box object
* @return text of the last released button (NULL: if unset) * @return text of the last released button (NULL: if unset)
*/ */
+5 -5
View File
@@ -19,15 +19,15 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_CONT == 0 #if LV_USE_CONT == 0
#error "lv_mbox: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1) " #error "lv_mbox: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1)"
#endif #endif
#if LV_USE_BTNMATRIX == 0 #if LV_USE_BTNMATRIX == 0
#error "lv_mbox: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1) " #error "lv_mbox: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1)"
#endif #endif
#if LV_USE_LABEL == 0 #if LV_USE_LABEL == 0
#error "lv_mbox: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " #error "lv_mbox: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
@@ -146,7 +146,7 @@ const char * lv_msgbox_get_text(const lv_obj_t * mbox);
/** /**
* Get the index of the lastly "activated" button by the user (pressed, released etc) * Get the index of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb`. * Useful in the `event_cb`.
* @param mbox pointer to message box object * @param mbox pointer to message box object
* @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset)
*/ */
@@ -154,7 +154,7 @@ uint16_t lv_msgbox_get_active_btn(lv_obj_t * mbox);
/** /**
* Get the text of the lastly "activated" button by the user (pressed, released etc) * Get the text of the lastly "activated" button by the user (pressed, released etc)
* Useful in the the `event_cb`. * Useful in the `event_cb`.
* @param mbox pointer to message box object * @param mbox pointer to message box object
* @return text of the last released button (NULL: if unset) * @return text of the last released button (NULL: if unset)
*/ */
+3 -3
View File
@@ -383,7 +383,7 @@ lv_coord_t lv_page_get_height_fit(lv_obj_t * page)
* Take into account the paddings of the background and scrollable too. * Take into account the paddings of the background and scrollable too.
* @param page pointer to an object * @param page pointer to an object
* @param div indicates how many columns are assumed. * @param div indicates how many columns are assumed.
* If 1 the width will be set the the parent's width * If 1 the width will be set the parent's width
* If 2 only half parent width - inner padding of the parent * If 2 only half parent width - inner padding of the parent
* If 3 only third parent width - 2 * inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent
* @param span how many columns are combined * @param span how many columns are combined
@@ -406,7 +406,7 @@ lv_coord_t lv_page_get_width_grid(lv_obj_t * page, uint8_t div, uint8_t span)
* Take into account the paddings of the background and scrollable too. * Take into account the paddings of the background and scrollable too.
* @param obj pointer to an object * @param obj pointer to an object
* @param div indicates how many rows are assumed. * @param div indicates how many rows are assumed.
* If 1 the height will be set the the parent's height * If 1 the height will be set the parent's height
* If 2 only half parent height - inner padding of the parent * If 2 only half parent height - inner padding of the parent
* If 3 only third parent height - 2 * inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent
* @param span how many rows are combined * @param span how many rows are combined
@@ -536,7 +536,7 @@ void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, lv_anim_enable_t anim_
scrlable_x = -(obj_x - scrl_left - bg_left); scrlable_x = -(obj_x - scrl_left - bg_left);
scrlable_x += scrl_left; scrlable_x += scrl_left;
} }
/*Out of the page on the rigth*/ /*Out of the page on the right*/
else if((obj_w <= page_w && right_err > 0) || (obj_w > page_w && left_err >= right_err)) { else if((obj_w <= page_w && right_err > 0) || (obj_w > page_w && left_err >= right_err)) {
/*Calculate a new position and let some space on the side*/ /*Calculate a new position and let some space on the side*/
scrlable_x = -(obj_x + scrl_right + bg_right); scrlable_x = -(obj_x + scrl_right + bg_right);
+3 -3
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_CONT == 0 #if LV_USE_CONT == 0
#error "lv_page: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1) " #error "lv_page: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1)"
#endif #endif
#include "lv_cont.h" #include "lv_cont.h"
@@ -273,7 +273,7 @@ lv_coord_t lv_page_get_height_fit(lv_obj_t * page);
* Take into account the paddings of the background and scrollable too. * Take into account the paddings of the background and scrollable too.
* @param page pointer to an object * @param page pointer to an object
* @param div indicates how many columns are assumed. * @param div indicates how many columns are assumed.
* If 1 the width will be set the the parent's width * If 1 the width will be set the parent's width
* If 2 only half parent width - inner padding of the parent * If 2 only half parent width - inner padding of the parent
* If 3 only third parent width - 2 * inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent
* @param span how many columns are combined * @param span how many columns are combined
@@ -286,7 +286,7 @@ lv_coord_t lv_page_get_width_grid(lv_obj_t * page, uint8_t div, uint8_t span);
* Take into account the paddings of the background and scrollable too. * Take into account the paddings of the background and scrollable too.
* @param page pointer to an object * @param page pointer to an object
* @param div indicates how many rows are assumed. * @param div indicates how many rows are assumed.
* If 1 the height will be set the the parent's height * If 1 the height will be set the parent's height
* If 2 only half parent height - inner padding of the parent * If 2 only half parent height - inner padding of the parent
* If 3 only third parent height - 2 * inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent
* @param span how many rows are combined * @param span how many rows are combined
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_PAGE == 0 #if LV_USE_PAGE == 0
#error "lv_roller: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " #error "lv_roller: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_BAR == 0 #if LV_USE_BAR == 0
#error "lv_slider: lv_bar is required. Enable it in lv_conf.h (LV_USE_BAR 1) " #error "lv_slider: lv_bar is required. Enable it in lv_conf.h (LV_USE_BAR 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_TEXTAREA == 0 #if LV_USE_TEXTAREA == 0
#error "lv_spinbox: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1) " #error "lv_spinbox: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+2 -2
View File
@@ -19,11 +19,11 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_ARC == 0 #if LV_USE_ARC == 0
#error "lv_spinner: lv_arc is required. Enable it in lv_conf.h (LV_USE_ARC 1) " #error "lv_spinner: lv_arc is required. Enable it in lv_conf.h (LV_USE_ARC 1)"
#endif #endif
#if LV_USE_ANIMATION == 0 #if LV_USE_ANIMATION == 0
#error "lv_spinner: animations are required. Enable it in lv_conf.h (LV_USE_ANIMATION 1) " #error "lv_spinner: animations are required. Enable it in lv_conf.h (LV_USE_ANIMATION 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
+1 -1
View File
@@ -12,7 +12,7 @@
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_SLIDER == 0 #if LV_USE_SLIDER == 0
#error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1) " #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1)"
#endif #endif
#include "../lv_misc/lv_debug.h" #include "../lv_misc/lv_debug.h"
+3 -3
View File
@@ -19,7 +19,7 @@ extern "C" {
/*Testing of dependencies*/ /*Testing of dependencies*/
#if LV_USE_LABEL == 0 #if LV_USE_LABEL == 0
#error "lv_table: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " #error "lv_table: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
#endif #endif
#include "../lv_core/lv_obj.h" #include "../lv_core/lv_obj.h"
@@ -56,7 +56,7 @@ typedef union {
struct { struct {
uint8_t align : 2; uint8_t align : 2;
uint8_t right_merge : 1; uint8_t right_merge : 1;
uint8_t type : 4; // upto 16 values uint8_t type : 4; // up to 16 values
uint8_t crop : 1; uint8_t crop : 1;
} s; } s;
uint8_t format_byte; uint8_t format_byte;
@@ -78,7 +78,7 @@ uint16_t cell_types :
/*Parts of the table*/ /*Parts of the table*/
enum { enum {
LV_TABLE_PART_BG, /* Because of this member, LV_PART.*CELL1 has enum value of 1, */ LV_TABLE_PART_BG, /* Because of this member, LV_PART.*CELL1 has enum value of 1, */
LV_TABLE_PART_CELL1, /* LV_PART.*CELL2 has an enum value of 2 and so on upto the maximum */ LV_TABLE_PART_CELL1, /* LV_PART.*CELL2 has an enum value of 2 and so on up to the maximum */
LV_TABLE_PART_CELL2, /* number of styles specified by LV_TABLE_CELL_STYLE_CNT */ LV_TABLE_PART_CELL2, /* number of styles specified by LV_TABLE_CELL_STYLE_CNT */
LV_TABLE_PART_CELL3, LV_TABLE_PART_CELL3,
LV_TABLE_PART_CELL4, /* CELL 5-16 are not needed to be defined, the values in this enum LV_TABLE_PART_CELL4, /* CELL 5-16 are not needed to be defined, the values in this enum

Some files were not shown because too many files have changed in this diff Show More