summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-05-28 12:10:58 +0200
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-05-28 12:10:58 +0200
commit85f08899ad48c2853787b8b409a8ee2632e3e4f9 (patch)
tree7d406d214be7172a645e59582a8bb4612c522878
parent9d31a60a91972876e6675e76ed9aaffe05783b48 (diff)
-rw-r--r--src/bin/e_comp_object.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 3a7101102..57b8517f6 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -603,7 +603,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
603 ((name) && (m->name) && (!e_util_glob_match(name, m->name)))) 603 ((name) && (m->name) && (!e_util_glob_match(name, m->name))))
604 continue; 604 continue;
605 if (!_e_comp_object_shadow_client_match(cw->ec, m)) continue; 605 if (!_e_comp_object_shadow_client_match(cw->ec, m)) continue;
606 606
607 focus = m->focus; 607 focus = m->focus;
608 urgent = m->urgent; 608 urgent = m->urgent;
609 no_shadow = m->no_shadow; 609 no_shadow = m->no_shadow;
@@ -1493,7 +1493,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
1493 } 1493 }
1494 if (!o) 1494 if (!o)
1495 /* top client layer window hasn't been stacked yet. this probably shouldn't happen? 1495 /* top client layer window hasn't been stacked yet. this probably shouldn't happen?
1496 * return here since the top client layer window 1496 * return here since the top client layer window
1497 */ 1497 */
1498 { 1498 {
1499 E_Client *ec; 1499 E_Client *ec;
@@ -2774,7 +2774,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj)
2774 } 2774 }
2775 else 2775 else
2776 e_comp_shape_queue(); 2776 e_comp_shape_queue();
2777 2777
2778 evas_object_show(obj); 2778 evas_object_show(obj);
2779 if (ref && (!stopping)) 2779 if (ref && (!stopping))
2780 { 2780 {
@@ -2845,7 +2845,7 @@ _e_comp_object_util_moveresize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
2845 evas_object_geometry_get(obj, NULL, NULL, &w, &h); 2845 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
2846 e_zoomap_child_resize(data, w, h); 2846 e_zoomap_child_resize(data, w, h);
2847 } 2847 }
2848 2848
2849 if (evas_object_visible_get(obj)) 2849 if (evas_object_visible_get(obj))
2850 e_comp_shape_queue(); 2850 e_comp_shape_queue();
2851} 2851}
@@ -3552,8 +3552,10 @@ e_comp_object_frame_theme_set(Evas_Object *obj, const char *name)
3552 cw->ec->changes.size = 1; 3552 cw->ec->changes.size = 1;
3553 EC_CHANGED(cw->ec); 3553 EC_CHANGED(cw->ec);
3554 } 3554 }
3555 if (cw->frame_object == edje_object_part_swallow_get(cw->shobj, "e.swallow.content")) 3555 edje_object_part_unswallow(cw->shobj, cw->frame_object);
3556 edje_object_part_unswallow(cw->frame_object); 3556 edje_object_part_unswallow(cw->frame_object, cw->frame_icon);
3557 edje_object_part_unswallow(cw->frame_object, cw->frame_volume);
3558 edje_object_part_unswallow(cw->frame_object, cw->obj);
3557 E_FREE_FUNC(cw->frame_object, evas_object_del); 3559 E_FREE_FUNC(cw->frame_object, evas_object_del);
3558 if (!name) goto reshadow; 3560 if (!name) goto reshadow;
3559 } 3561 }