Merge branch 'master' into dev

library.json

@@ -1,6 +1,6 @@
 {
 	"name": "lvgl",
-    "version": "7.5.0",
+    "version": "7.6.0",
 	"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.5.0
+version=7.6.0
 author=kisvegabor
 maintainer=kisvegabor,embeddedt,pete-pjb
 sentence=Full-featured Graphics Library for Embedded Systems

scripts/release.py

@@ -456,7 +456,7 @@ def cleanup():
     cmd("rm -fr " + workdir)
 
 if __name__ == '__main__':
-    dev_prepare = 'minor'
+    dev_prepare = 'bugfix'
     if(len(sys.argv) != 2):
         print("Missing argument. Usage ./release.py bugfix | minor | major")
         print("Use minor by deafult")
@@ -474,7 +474,7 @@ if __name__ == '__main__':
     dev_ver_patch = ver_patch
     dev_ver_str = ver_str
     
-   get_lvgl_version("master")
+    get_lvgl_version("master")
     
     lvgl_prepare()
     lv_examples_prepare() 
@@ -496,13 +496,6 @@ if __name__ == '__main__':
         lvgl_update_master_version()
         docs_update_latest_version()
 
-        get_lvgl_version("dev")
-        dev_ver_str = "v" + ver_major + "." + ver_minor + "." + ver_patch + "-dev"
-        merge_to_dev()
-        
-        lvgl_update_dev_version()
-        docs_update_dev_version()
-        publish_dev()
     else:
         #merge_from_dev()
         

src/lv_core/lv_obj.c

@@ -102,9 +102,9 @@ typedef struct {
     lv_color_t scale_grad_color;
     lv_color_t scale_end_color;
     lv_opa_t opa_scale;
-    uint32_t clip_corder :1;
-    uint32_t border_post :1;
-}style_snapshot_t;
+    uint32_t clip_corder : 1;
+    uint32_t border_post : 1;
+} style_snapshot_t;
 
 typedef enum {
     STYLE_COMPARE_SAME,