fix conflicts

lv_conf_template.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_conf.h
- * Configuration file for v7.6.0-dev-dev
+ * Configuration file for v7.4.0-dev
  */
 
 /*

scripts/release.py

@@ -52,7 +52,7 @@ from os import path
 from datetime import date
 import sys
 
-upstream_org_url = "https://github.com/kisvegabor/"
+upstream_org_url = "https://github.com/lvgl/"
 workdir = "./release_tmp"
 proj_list = [ "lv_sim_eclipse_sdl"]
 
@@ -105,10 +105,10 @@ def clone_repos():
     os.chdir(workdir)
 
     #For debuging just copy the repos
-    cmd("cp -a ../repos/. .")
-    return
+    #cmd("cp -a ../repos/. .")
+    #return
 
-    cmd("git clone " + upstream("lvgl") + " lvgl; cd lvgl; git checkout master")
+    cmd("git clone " + upstream("lvgl") + "; cd lvgl; git checkout master")
     cmd("git clone " + upstream("lv_examples") + "; cd lv_examples; git checkout master")
     cmd("git clone " + upstream("lv_drivers") + "; cd lv_drivers; git checkout master")
     cmd("git clone --recurse-submodules " + upstream("docs") + "; cd docs; git checkout master")
@@ -348,7 +348,7 @@ def lvgl_update_master_version():
     templ = fnmatch.filter(os.listdir('.'), '*templ*')
     if templ[0]:    
         print("Updating version in " + templ[0])
-        cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+/"+ ver_str +"/' " + templ[0])
+        cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/"+ ver_str +"/' " + templ[0])
     
     
     cmd("git commit -am 'Update version'")
@@ -381,7 +381,7 @@ def lvgl_update_dev_version():
     templ = fnmatch.filter(os.listdir('.'), '*templ*')
     if templ[0]:    
         print("Updating version in " + templ[0])
-        cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+/"+ dev_ver_str +"/' " + templ[0])
+        cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/"+ dev_ver_str +"/' " + templ[0])
     
     
     cmd("git commit -am 'Update dev version'")
@@ -450,23 +450,19 @@ def cleanup():
     cmd("rm -fr " + workdir)
 
 if __name__ == '__main__':
-    if(len(sys.argv) != 2):
-        print("Argument error. Usage ./release.py bugfix | minor | major") 
-        #exit(1)
-        
-    #dev_prepare = sys.argv[1]
     dev_prepare = 'minor'
+    if(len(sys.argv) != 2):
+        print("Missing argument. Usage ./release.py bugfix | minor | major")
+        print("Use minor by deafult")
+    else:      
+        dev_prepare = sys.argv[1]
+    
     if not (dev_prepare in prepare_type): 
         print("Invalid argument. Usage ./release.py bugfix | minor | major") 
         exit(1)
         
     clone_repos()
     get_lvgl_version("master")
-    
-    projs_update()    
-    
-    exit(1);
-    
     lvgl_prepare()
     lv_examples_prepare() 
     lv_drivers_prepare()

src/lv_core/lv_refr.c

@@ -572,10 +572,15 @@ static lv_obj_t * lv_refr_get_top_obj(const lv_area_t * area_p, lv_obj_t * obj)
 
     /*If this object is fully cover the draw area check the children too */
     if(_lv_area_is_in(area_p, &obj->coords, 0) && obj->hidden == 0) {
-        lv_design_res_t design_res = obj->design_cb ? obj->design_cb(obj, area_p,
-                                                                     LV_DESIGN_COVER_CHK) : LV_DESIGN_RES_NOT_COVER;
+        lv_design_res_t design_res = obj->design_cb(obj, area_p, LV_DESIGN_COVER_CHK);
         if(design_res == LV_DESIGN_RES_MASKED) return NULL;
 
+#if LV_USE_OPA_SCALE
+        if(design_res == LV_DESIGN_RES_COVER && lv_obj_get_style_opa_scale(obj, LV_OBJ_PART_MAIN) != LV_OPA_COVER) {
+            design_res = LV_DESIGN_RES_NOT_COVER;
+        }
+#endif
+
         lv_obj_t * i;
         _LV_LL_READ(obj->child_ll, i) {
             found_p = lv_refr_get_top_obj(area_p, i);

src/lv_widgets/lv_arc.c

@@ -1081,6 +1081,7 @@ static void value_update(lv_obj_t * arc)
         default: /** LV_ARC_TYPE_NORMAL*/
             angle = _lv_map(ext->cur_value, ext->min_value, ext->max_value, ext->bg_angle_start, bg_end);
             lv_arc_set_end_angle(arc, angle);
+            lv_arc_set_start_angle(arc, ext->bg_angle_start);
     }
     ext->last_angle = angle; /*Cache angle for slew rate limiting*/
 }

src/lv_widgets/lv_gauge.c

@@ -619,7 +619,6 @@ static void lv_gauge_draw_needle(lv_obj_t * gauge, const lv_area_t * clip_area)
             lv_draw_img_dsc_t img_dsc;
             lv_draw_img_dsc_init(&img_dsc);
             lv_obj_init_draw_img_dsc(gauge, LV_GAUGE_PART_MAIN, &img_dsc);
-            img_dsc.recolor_opa = LV_OPA_COVER;
             img_dsc.pivot.x = ext->needle_img_pivot.x;
             img_dsc.pivot.y = ext->needle_img_pivot.y;
 

src/lv_widgets/lv_img.c

@@ -605,6 +605,11 @@ static lv_design_res_t lv_img_design(lv_obj_t * img, const lv_area_t * clip_area
             if(_lv_area_is_in(clip_area, &a, 0) == false) return LV_DESIGN_RES_NOT_COVER;
         }
 
+#if LV_USE_BLEND_MODES
+        if(lv_obj_get_style_bg_blend_mode(img, LV_IMG_PART_MAIN) != LV_BLEND_MODE_NORMAL) return LV_DESIGN_RES_NOT_COVER;
+        if(lv_obj_get_style_image_blend_mode(img, LV_IMG_PART_MAIN) != LV_BLEND_MODE_NORMAL) return LV_DESIGN_RES_NOT_COVER;
+#endif
+
         return LV_DESIGN_RES_COVER;
     }
     else if(mode == LV_DESIGN_DRAW_MAIN) {