diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index 7b22b1e36..df66c671b 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -27,7 +27,9 @@ 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 - Work in progress - Remove the align parameter from `lv_canvas_draw_text` -- Make the `copy` parameter of `create` functions deprecated +- Remove the copy paramter from create functions +- Style selectors and style-based states See [#1832](https://github.com/lvgl/lvgl/issues/1832) +- Add Object Orianted system [#1919](https://github.com/lvgl/lvgl/issues/1919) ## v8.1 - Add radio button widget @@ -39,11 +41,13 @@ Planned to November/December 2020 ## v9 - Simplify `group`s. Discussion is [here](https://forum.lvgl.io/t/lv-group-tabindex/2927/3). - Consider direct binary font format support -- Remove the copy paramter from create functions -- Style selectors and style-based states See [#1832](https://github.com/lvgl/lvgl/issues/1832) - Optimize line and cirle 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)) - 9-patch support for `lv_imgbtn`. +- Handle stride. See [#1858](https://github.com/lvgl/lvgl/issues/1858) +- Make gradients more versatile +- Make image transformations more versatile +- Allow snapshoting object to tranfrom them as images ## v10 - Remove property level states diff --git a/examples/LVGL_Arduino.ino b/examples/LVGL_Arduino.ino index 4e777c19e..658fd9d8e 100644 --- a/examples/LVGL_Arduino.ino +++ b/examples/LVGL_Arduino.ino @@ -36,26 +36,11 @@ bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) bool touched = tft.getTouch(&touchX, &touchY, 600); - if(!touched) - { + if(!touched) { data->state = LV_INDEV_STATE_REL; - return false; - } - else - { + } else { data->state = LV_INDEV_STATE_PR; - } - - if(touchX>screenWidth || touchY > screenHeight) - { - Serial.println("Y or y outside of expected parameters.."); - Serial.print("y:"); - Serial.print(touchX); - Serial.print(" x:"); - Serial.print(touchY); - } - else - { + /*Set the coordinates*/ data->point.x = touchX; data->point.y = touchY; @@ -65,7 +50,6 @@ bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) Serial.print("Data y"); Serial.println(touchY); - } return false; /*Return `false` because we are not buffering and no more data to read*/ diff --git a/src/lv_font/lv_font.mk b/src/lv_font/lv_font.mk index 5b2f8bc05..31fdbd710 100644 --- a/src/lv_font/lv_font.mk +++ b/src/lv_font/lv_font.mk @@ -1,6 +1,8 @@ CSRCS += lv_font.c CSRCS += lv_font_fmt_txt.c CSRCS += lv_font_loader.c +CSRCS += lv_font_montserrat_8.c +CSRCS += lv_font_montserrat_10.c CSRCS += lv_font_montserrat_12.c CSRCS += lv_font_montserrat_14.c CSRCS += lv_font_montserrat_16.c diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index f885f73c9..9da688732 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -27,7 +27,7 @@ /*BUTTON*/ #define COLOR_BTN (IS_LIGHT ? lv_color_hex(0xffffff) : lv_color_hex(0x586273)) -#define COLOR_BTN_PR (IS_LIGHT ? lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_10) : lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_30)) +#define COLOR_BTN_PR (IS_LIGHT ? lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_20) : lv_color_mix(theme.color_primary, COLOR_BTN, LV_OPA_30)) #define COLOR_BTN_CHK (theme.color_primary) #define COLOR_BTN_CHK_PR (lv_color_darken(theme.color_primary, LV_OPA_30)) diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index 2233ce281..9f4773c8a 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -715,8 +715,9 @@ void lv_textarea_set_pwd_mode(lv_obj_t * ta, bool en) lv_textarea_ext_t * ext = lv_obj_get_ext_attr(ta); if(ext->pwd_mode == en) return; + ext->pwd_mode = en == false ? 0 : 1; /*Pwd mode is now enabled*/ - if(ext->pwd_mode == 0 && en != false) { + if(en != false) { char * txt = lv_label_get_text(ext->label); size_t len = strlen(txt); ext->pwd_tmp = lv_mem_alloc(len + 1); @@ -730,15 +731,13 @@ void lv_textarea_set_pwd_mode(lv_obj_t * ta, bool en) lv_textarea_clear_selection(ta); } /*Pwd mode is now disabled*/ - else if(ext->pwd_mode == 1 && en == false) { + else { lv_textarea_clear_selection(ta); lv_label_set_text(ext->label, ext->pwd_tmp); lv_mem_free(ext->pwd_tmp); ext->pwd_tmp = NULL; } - ext->pwd_mode = en == false ? 0 : 1; - refr_cursor_area(ta); }