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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2021-02-02 15:12:11 +01:00
commit 21051b8d60
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lvgl.h
View File

@ -16,7 +16,7 @@ extern "C" {
#define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MAJOR 7
#define LVGL_VERSION_MINOR 11 #define LVGL_VERSION_MINOR 11
#define LVGL_VERSION_PATCH 0 #define LVGL_VERSION_PATCH 0
#define LVGL_VERSION_INFO "dev" #define LVGL_VERSION_INFO ""
/********************* /*********************
* INCLUDES * INCLUDES

2
src/lv_core/lv_indev.c
View File

@ -1148,7 +1148,7 @@ lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point)
hidden_i = lv_obj_get_parent(hidden_i); hidden_i = lv_obj_get_parent(hidden_i);
} }
/*No parent found with hidden == true*/ /*No parent found with hidden == true*/
if(lv_obj_is_protected(obj, LV_PROTECT_EVENT_TO_DISABLED) == false){ if(lv_obj_is_protected(obj, LV_PROTECT_EVENT_TO_DISABLED) == false) {
if(hidden_i == NULL && (lv_obj_get_state(obj, LV_OBJ_PART_MAIN) & LV_STATE_DISABLED) == false) found_p = obj; if(hidden_i == NULL && (lv_obj_get_state(obj, LV_OBJ_PART_MAIN) & LV_STATE_DISABLED) == false) found_p = obj;
} }
else { else {

2
src/lv_font/lv_font_loader.c
View File

@ -446,7 +446,7 @@ static int32_t load_glyph(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_dsc,
int next_offset = (i < loca_count - 1) ? glyph_offset[i + 1] : (uint32_t)glyph_length; int next_offset = (i < loca_count - 1) ? glyph_offset[i + 1] : (uint32_t)glyph_length;
int bmp_size = next_offset - glyph_offset[i] - nbits / 8; int bmp_size = next_offset - glyph_offset[i] - nbits / 8;
if (nbits % 8 == 0) { /* Fast path */ if(nbits % 8 == 0) { /* Fast path */
if(lv_fs_read(fp, &glyph_bmp[cur_bmp_size], bmp_size, NULL) != LV_FS_RES_OK) { if(lv_fs_read(fp, &glyph_bmp[cur_bmp_size], bmp_size, NULL) != LV_FS_RES_OK) {
return -1; return -1;
} }

17
src/lv_widgets/lv_keyboard.c
View File

@ -41,7 +41,7 @@ static const char * const default_kb_map_lc[] = {"1#", "q", "w", "e", "r", "t",
#if LV_USE_ARABIC_PERSIAN_CHARS == 1 #if LV_USE_ARABIC_PERSIAN_CHARS == 1
"أب", "أب",
#endif #endif
LV_SYMBOL_LEFT," ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""
}; };
static const lv_btnmatrix_ctrl_t default_kb_ctrl_lc_map[] = { static const lv_btnmatrix_ctrl_t default_kb_ctrl_lc_map[] = {
@ -76,19 +76,18 @@ static const lv_btnmatrix_ctrl_t default_kb_ctrl_uc_map[] = {
2, 6, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2 2, 6, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2
}; };
#if LV_USE_ARABIC_PERSIAN_CHARS == 1 #if LV_USE_ARABIC_PERSIAN_CHARS == 1
static const char * const default_kb_map_ar[] = static const char * const default_kb_map_ar[] = {
{ "1#", "ض", "ص", "ث", "ق", "ف", "غ", "ع", "ه", "خ", "ح", "ج", "\n",
"1#", "ض", "ص", "ث", "ق", "ف", "غ", "ع", "ه","خ", "ح","ج", "\n",
"ش", "س", "ي", "ب", "ل", "ا", "ت", "ن", "م", "ك", "ط", LV_SYMBOL_BACKSPACE, "\n", "ش", "س", "ي", "ب", "ل", "ا", "ت", "ن", "م", "ك", "ط", LV_SYMBOL_BACKSPACE, "\n",
"ذ", "ء", "ؤ", "ر", "ى", "ة", "و", "ز", "ظ", "د", "ز", "ظ", "د","\n", "ذ", "ء", "ؤ", "ر", "ى", "ة", "و", "ز", "ظ", "د", "ز", "ظ", "د", "\n",
LV_SYMBOL_CLOSE,"abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT,LV_SYMBOL_NEW_LINE,LV_SYMBOL_OK, "" LV_SYMBOL_CLOSE, "abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_NEW_LINE, LV_SYMBOL_OK, ""
}; };
static const lv_btnmatrix_ctrl_t default_kb_ctrl_ar_map[] = { static const lv_btnmatrix_ctrl_t default_kb_ctrl_ar_map[] = {
LV_KEYBOARD_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, LV_KEYBOARD_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
LV_KEYBOARD_CTRL_BTN_FLAGS | 2,LV_KEYBOARD_CTRL_BTN_FLAGS | 2,2, 6, 2, 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 2 LV_KEYBOARD_CTRL_BTN_FLAGS | 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2, 2, 6, 2, 3, LV_KEYBOARD_CTRL_BTN_FLAGS | 2
}; };
#endif #endif
@ -133,7 +132,7 @@ static const char * * kb_map[] = {
(const char * *)default_kb_map_spec, (const char * *)default_kb_map_spec,
(const char * *)default_kb_map_num (const char * *)default_kb_map_num
#if LV_USE_ARABIC_PERSIAN_CHARS == 1 #if LV_USE_ARABIC_PERSIAN_CHARS == 1
,(const char * *)default_kb_map_ar , (const char * *)default_kb_map_ar
#endif #endif
}; };
static const lv_btnmatrix_ctrl_t * kb_ctrl[] = { static const lv_btnmatrix_ctrl_t * kb_ctrl[] = {
@ -142,7 +141,7 @@ static const lv_btnmatrix_ctrl_t * kb_ctrl[] = {
default_kb_ctrl_spec_map, default_kb_ctrl_spec_map,
default_kb_ctrl_num_map default_kb_ctrl_num_map
#if LV_USE_ARABIC_PERSIAN_CHARS == 1 #if LV_USE_ARABIC_PERSIAN_CHARS == 1
,default_kb_ctrl_ar_map , default_kb_ctrl_ar_map
#endif #endif
}; };

2
src/lv_widgets/lv_keyboard.h
View File

@ -45,7 +45,7 @@ enum {
LV_KEYBOARD_MODE_SPECIAL, LV_KEYBOARD_MODE_SPECIAL,
LV_KEYBOARD_MODE_NUM LV_KEYBOARD_MODE_NUM
#if LV_USE_ARABIC_PERSIAN_CHARS == 1 #if LV_USE_ARABIC_PERSIAN_CHARS == 1
,LV_KEYBOARD_MODE_TEXT_ARABIC , LV_KEYBOARD_MODE_TEXT_ARABIC
#endif #endif
}; };
typedef uint8_t lv_keyboard_mode_t; typedef uint8_t lv_keyboard_mode_t;