Merge branch 'master' into dev

library.json

@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-    "version": "7.6.0",
+    "version": "7.6.1",
 	"keywords": "graphics, gui, embedded, tft, lvgl",
 	"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
 	"repository": {

library.properties

@@ -1,5 +1,5 @@
 name=lvgl
-version=7.6.0
+version=7.6.1
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems

src/lv_conf_internal.h

@@ -10,14 +10,6 @@
 
 #include <stdint.h>
 
-#if defined __has_include
-#  if __has_include("lv_conf.h")
-#   ifndef LV_CONF_INCLUDE_SIMPLE
-#    define LV_CONF_INCLUDE_SIMPLE
-#   endif
-#  endif
-#endif
-
 /*If lv_conf.h is not skipped include it*/
 #if !defined(LV_CONF_SKIP) && !defined(CONFIG_LV_CONF_SKIP)
 #  if defined(LV_CONF_PATH)											/*If there is a path defined for lv_conf.h use it*/
@@ -1285,7 +1277,7 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
 
 /* Support bidirectional texts.
  * Allows mixing Left-to-Right and Right-to-Left texts.
- * The direction will be processed according to the Unicode Bidirectional Algorithm:
+ * The direction will be processed according to the Unicode Bidirectioanl Algorithm:
  * https://www.w3.org/International/articles/inline-bidi-markup/uba-basics*/
 #ifndef LV_USE_BIDI
 #  ifdef CONFIG_LV_USE_BIDI

src/lv_widgets/lv_checkbox.c

@@ -145,7 +145,8 @@ void lv_checkbox_set_checked(lv_obj_t * cb, bool checked)
     if(checked) {
         lv_obj_add_state(ext->bullet, LV_STATE_CHECKED);
         lv_obj_add_state(ext->label, LV_STATE_CHECKED);
-    } else {
+    }
+    else {
         lv_obj_clear_state(ext->bullet, LV_STATE_CHECKED);
         lv_obj_clear_state(ext->label, LV_STATE_CHECKED);
     }