diff --git a/lvgl.h b/lvgl.h index 02ace0af0..4aa1d7e2b 100644 --- a/lvgl.h +++ b/lvgl.h @@ -16,7 +16,7 @@ extern "C" { #define LVGL_VERSION_MAJOR 7 #define LVGL_VERSION_MINOR 11 #define LVGL_VERSION_PATCH 0 -#define LVGL_VERSION_INFO "dev" +#define LVGL_VERSION_INFO "" /********************* * INCLUDES diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index f9ed12714..b7f7f7e0d 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -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); } /*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; } else { diff --git a/src/lv_font/lv_font_loader.c b/src/lv_font/lv_font_loader.c index d5d6fe119..1b974c050 100644 --- a/src/lv_font/lv_font_loader.c +++ b/src/lv_font/lv_font_loader.c @@ -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 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) { return -1; } diff --git a/src/lv_widgets/lv_keyboard.c b/src/lv_widgets/lv_keyboard.c index d97fc217a..e27f00d4e 100644 --- a/src/lv_widgets/lv_keyboard.c +++ b/src/lv_widgets/lv_keyboard.c @@ -37,11 +37,11 @@ static lv_signal_cb_t ancestor_signal; static const char * const default_kb_map_lc[] = {"1#", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", LV_SYMBOL_BACKSPACE, "\n", "ABC", "a", "s", "d", "f", "g", "h", "j", "k", "l", LV_SYMBOL_NEW_LINE, "\n", "_", "-", "z", "x", "c", "v", "b", "n", "m", ".", ",", ":", "\n", - LV_SYMBOL_CLOSE, + LV_SYMBOL_CLOSE, #if LV_USE_ARABIC_PERSIAN_CHARS == 1 "أب", -#endif - LV_SYMBOL_LEFT," ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" +#endif + LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, "" }; static const lv_btnmatrix_ctrl_t default_kb_ctrl_lc_map[] = { @@ -62,7 +62,7 @@ static const char * const default_kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", #if LV_USE_ARABIC_PERSIAN_CHARS == 1 "أب", #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_uc_map[] = { @@ -73,29 +73,28 @@ static const lv_btnmatrix_ctrl_t default_kb_ctrl_uc_map[] = { #if LV_USE_ARABIC_PERSIAN_CHARS == 1 LV_KEYBOARD_CTRL_BTN_FLAGS | 2, #endif - 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 -static const char * const default_kb_map_ar[] = -{ - "1#", "ض", "ص", "ث", "ق", "ف", "غ", "ع", "ه","خ", "ح","ج", "\n", +static const char * const default_kb_map_ar[] = { + "1#", "ض", "ص", "ث", "ق", "ف", "غ", "ع", "ه", "خ", "ح", "ج", "\n", "ش", "س", "ي", "ب", "ل", "ا", "ت", "ن", "م", "ك", "ط", LV_SYMBOL_BACKSPACE, "\n", - "ذ", "ء", "ؤ", "ر", "ى", "ة", "و", "ز", "ظ", "د", "ز", "ظ", "د","\n", - LV_SYMBOL_CLOSE,"abc", LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT,LV_SYMBOL_NEW_LINE,LV_SYMBOL_OK, "" + "ذ", "ء", "ؤ", "ر", "ى", "ة", "و", "ز", "ظ", "د", "ز", "ظ", "د", "\n", + 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[] = { 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, 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 static const char * const default_kb_map_spec[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0", LV_SYMBOL_BACKSPACE, "\n", "abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n", "\\", "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n", - LV_SYMBOL_CLOSE, + LV_SYMBOL_CLOSE, #if LV_USE_ARABIC_PERSIAN_CHARS == 1 "أب", #endif @@ -110,7 +109,7 @@ static const lv_btnmatrix_ctrl_t default_kb_ctrl_spec_map[] = { #if LV_USE_ARABIC_PERSIAN_CHARS == 1 LV_KEYBOARD_CTRL_BTN_FLAGS | 2, #endif - 2, 6, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2 + 2, 6, 2, LV_KEYBOARD_CTRL_BTN_FLAGS | 2 }; static const char * const default_kb_map_num[] = {"1", "2", "3", LV_SYMBOL_CLOSE, "\n", @@ -133,7 +132,7 @@ static const char * * kb_map[] = { (const char * *)default_kb_map_spec, (const char * *)default_kb_map_num #if LV_USE_ARABIC_PERSIAN_CHARS == 1 - ,(const char * *)default_kb_map_ar + , (const char * *)default_kb_map_ar #endif }; 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_num_map #if LV_USE_ARABIC_PERSIAN_CHARS == 1 - ,default_kb_ctrl_ar_map + , default_kb_ctrl_ar_map #endif }; diff --git a/src/lv_widgets/lv_keyboard.h b/src/lv_widgets/lv_keyboard.h index 2443bfaa9..b1f7ff817 100644 --- a/src/lv_widgets/lv_keyboard.h +++ b/src/lv_widgets/lv_keyboard.h @@ -45,7 +45,7 @@ enum { LV_KEYBOARD_MODE_SPECIAL, LV_KEYBOARD_MODE_NUM #if LV_USE_ARABIC_PERSIAN_CHARS == 1 - ,LV_KEYBOARD_MODE_TEXT_ARABIC + , LV_KEYBOARD_MODE_TEXT_ARABIC #endif }; typedef uint8_t lv_keyboard_mode_t;