summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2014-09-23 10:27:04 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2014-09-23 10:31:25 -0400
commitd4e289727a2df6c9c52e17d15c91713313894218 (patch)
tree121bbfce6e99011a5d319910984ad31b82fdac12
parent16f3595f7df35b78d671a30958d720c9c2123324 (diff)
force comp render queue more aggressively to detect changes in nocomp
-rw-r--r--src/bin/e_comp_object.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 89dab75fc..3ab04889d 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -971,6 +971,7 @@ _e_comp_intercept_layer_set(void *data, Evas_Object *obj, int layer)
971 E_Client *ec; 971 E_Client *ec;
972 972
973 e_comp_shape_queue(cw->comp); 973 e_comp_shape_queue(cw->comp);
974 e_comp_render_queue(cw->comp);
974 ec = e_client_above_get(cw->ec); 975 ec = e_client_above_get(cw->ec);
975 if (ec && (evas_object_layer_get(ec->frame) != evas_object_layer_get(obj))) 976 if (ec && (evas_object_layer_get(ec->frame) != evas_object_layer_get(obj)))
976 { 977 {
@@ -1040,6 +1041,7 @@ _e_comp_intercept_layer_set(void *data, Evas_Object *obj, int layer)
1040 /* can't stack a client above its own layer marker */ 1041 /* can't stack a client above its own layer marker */
1041 CRI("STACKING ERROR!!!"); 1042 CRI("STACKING ERROR!!!");
1042 } 1043 }
1044 e_comp_render_queue(cw->comp);
1043 e_comp_shape_queue(cw->comp); 1045 e_comp_shape_queue(cw->comp);
1044} 1046}
1045 1047
@@ -1142,6 +1144,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
1142 } 1144 }
1143 if (cw->ec->new_client || (!ecstack) || (ecstack->frame != o)) 1145 if (cw->ec->new_client || (!ecstack) || (ecstack->frame != o))
1144 evas_object_data_del(cw->smart_obj, "client_restack"); 1146 evas_object_data_del(cw->smart_obj, "client_restack");
1147 e_comp_render_queue(cw->comp);
1145 e_comp_shape_queue(cw->comp); 1148 e_comp_shape_queue(cw->comp);
1146} 1149}
1147 1150
@@ -1182,6 +1185,7 @@ _e_comp_intercept_lower(void *data, Evas_Object *obj)
1182 evas_object_data_set(obj, "client_restack", (void*)1); 1185 evas_object_data_set(obj, "client_restack", (void*)1);
1183 evas_object_lower(obj); 1186 evas_object_lower(obj);
1184 evas_object_data_del(obj, "client_restack"); 1187 evas_object_data_del(obj, "client_restack");
1188 e_comp_render_queue(cw->comp);
1185 e_comp_shape_queue(cw->comp); 1189 e_comp_shape_queue(cw->comp);
1186} 1190}
1187 1191
@@ -1213,6 +1217,7 @@ _e_comp_intercept_raise(void *data, Evas_Object *obj)
1213 if (e_client_focus_track_enabled()) 1217 if (e_client_focus_track_enabled())
1214 e_client_raise_latest_set(cw->ec); //modify raise list if necessary 1218 e_client_raise_latest_set(cw->ec); //modify raise list if necessary
1215 } 1219 }
1220 e_comp_render_queue(cw->comp);
1216 e_comp_shape_queue(cw->comp); 1221 e_comp_shape_queue(cw->comp);
1217} 1222}
1218 1223
@@ -1954,6 +1959,7 @@ _e_comp_smart_show(Evas_Object *obj)
1954 evas_object_show(cw->clip); 1959 evas_object_show(cw->clip);
1955 if (cw->input_obj) evas_object_show(cw->input_obj); 1960 if (cw->input_obj) evas_object_show(cw->input_obj);
1956 evas_object_show(cw->effect_obj); 1961 evas_object_show(cw->effect_obj);
1962 e_comp_render_queue(cw->comp);
1957 e_comp_shape_queue(cw->comp); 1963 e_comp_shape_queue(cw->comp);
1958 if (cw->ec->input_only) return; 1964 if (cw->ec->input_only) return;
1959 if (cw->ec->iconic && (!cw->ec->new_client)) 1965 if (cw->ec->iconic && (!cw->ec->new_client))
@@ -2163,10 +2169,13 @@ _e_comp_object_util_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object
2163 if (comp_object) 2169 if (comp_object)
2164 { 2170 {
2165 Evas_Object *o; 2171 Evas_Object *o;
2172 E_Comp *comp;
2166 2173
2167 o = edje_object_part_swallow_get(obj, "e.swallow.content"); 2174 o = edje_object_part_swallow_get(obj, "e.swallow.content");
2168 evas_object_del(o); 2175 evas_object_del(o);
2169 e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj)); 2176 comp = e_comp_util_evas_object_comp_get(obj);
2177 e_comp_render_queue(comp);
2178 e_comp_shape_queue(comp);
2170 } 2179 }
2171 l = evas_object_data_get(obj, "comp_object-to_del"); 2180 l = evas_object_data_get(obj, "comp_object-to_del");
2172 E_FREE_LIST(l, evas_object_del); 2181 E_FREE_LIST(l, evas_object_del);