summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib/canvas/evas_object_image.c
diff options
context:
space:
mode:
Diffstat (limited to 'legacy/evas/src/lib/canvas/evas_object_image.c')
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_image.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index 721eaa5..932f11a 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -573,10 +573,10 @@ _image_source_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
573 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 573 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
574 574
575 source_events = !!source_events; 575 source_events = !!source_events;
576 if (obj->proxy.source_events == source_events) return; 576 if (obj->proxy.src_events == source_events) return;
577 obj->proxy.source_events = source_events; 577 obj->proxy.src_events = source_events;
578 if (!o->cur.source) return; 578 if (!o->cur.source) return;
579 if ((obj->proxy.source_invisible) || (!source_events)) return; 579 if ((obj->proxy.src_invisible) || (!source_events)) return;
580 //FIXME: Feed mouse events here. 580 //FIXME: Feed mouse events here.
581} 581}
582 582
@@ -599,7 +599,7 @@ _image_source_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
599 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 599 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
600 Eina_Bool *source_events = va_arg(*list, Eina_Bool *); 600 Eina_Bool *source_events = va_arg(*list, Eina_Bool *);
601 if (!source_events) return; 601 if (!source_events) return;
602 *source_events = obj->proxy.source_events; 602 *source_events = obj->proxy.src_events;
603} 603}
604 604
605EAPI void 605EAPI void
@@ -623,13 +623,13 @@ _image_source_visible_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
623 623
624 visible = !!visible; 624 visible = !!visible;
625 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS); 625 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
626 if (src_obj->proxy.source_invisible == !visible) return; 626 if (src_obj->proxy.src_invisible == !visible) return;
627 src_obj->proxy.source_invisible = !visible; 627 src_obj->proxy.src_invisible = !visible;
628 src_obj->changed_source_visible = EINA_TRUE; 628 src_obj->changed_src_visible = EINA_TRUE;
629 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE, 629 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
630 EINA_FALSE, EINA_TRUE); 630 EINA_FALSE, EINA_TRUE);
631 evas_object_change(o->cur.source, src_obj); 631 evas_object_change(o->cur.source, src_obj);
632 if ((!visible) || (!src_obj->proxy.source_events)) return; 632 if ((!visible) || (!src_obj->proxy.src_events)) return;
633 //FIXME: Feed mouse events here. 633 //FIXME: Feed mouse events here.
634} 634}
635 635
@@ -656,7 +656,7 @@ _image_source_visible_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
656 if (!visible) return; 656 if (!visible) return;
657 if (!o->cur.source) *visible = EINA_FALSE; 657 if (!o->cur.source) *visible = EINA_FALSE;
658 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS); 658 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
659 if (src_obj) *visible = !src_obj->proxy.source_invisible; 659 if (src_obj) *visible = !src_obj->proxy.src_invisible;
660 else *visible = EINA_FALSE; 660 else *visible = EINA_FALSE;
661} 661}
662 662
@@ -2671,10 +2671,10 @@ _proxy_unset(Evas_Object *proxy)
2671 cur_source->proxy.proxies = eina_list_remove(cur_source->proxy.proxies, proxy); 2671 cur_source->proxy.proxies = eina_list_remove(cur_source->proxy.proxies, proxy);
2672 cur_proxy->proxy.is_proxy = EINA_FALSE; 2672 cur_proxy->proxy.is_proxy = EINA_FALSE;
2673 2673
2674 if (cur_source->proxy.source_invisible) 2674 if (cur_source->proxy.src_invisible)
2675 { 2675 {
2676 cur_source->proxy.source_invisible = EINA_FALSE; 2676 cur_source->proxy.src_invisible = EINA_FALSE;
2677 cur_source->changed_source_visible = EINA_TRUE; 2677 cur_source->changed_src_visible = EINA_TRUE;
2678 evas_object_change(o->cur.source, cur_source); 2678 evas_object_change(o->cur.source, cur_source);
2679 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE, 2679 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
2680 EINA_FALSE, EINA_TRUE); 2680 EINA_FALSE, EINA_TRUE);
@@ -3696,7 +3696,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
3696 evas_object_render_pre_visible_change(&e->clip_changes, eo_obj, is_v, was_v); 3696 evas_object_render_pre_visible_change(&e->clip_changes, eo_obj, is_v, was_v);
3697 if (!o->pixel_updates) goto done; 3697 if (!o->pixel_updates) goto done;
3698 } 3698 }
3699 if (obj->changed_map || obj->changed_source_visible) 3699 if (obj->changed_map || obj->changed_src_visible)
3700 { 3700 {
3701 evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj); 3701 evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
3702 goto done; 3702 goto done;