summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-19 08:25:08 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2013-02-19 08:25:08 +0000
commit90d6da42c5da21279f9b36fe80a445732e98f42c (patch)
treecff0ea40b6ca940a13fc0ef014416eb58ba87e64
parent622d13ee8f0c2706603ecc3df6a227713941cf1f (diff)
block _e_comp_win_render_queue completely for real objects
SVN revision: 84085
Diffstat (limited to '')
-rw-r--r--src/bin/e_comp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index b473a540a..e0861c666 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1376,6 +1376,7 @@ _e_comp_render_queue(E_Comp *c)
1376static void 1376static void
1377_e_comp_win_render_queue(E_Comp_Win *cw) 1377_e_comp_win_render_queue(E_Comp_Win *cw)
1378{ 1378{
1379 if (cw->real_obj) return;
1379 DBG("JOB3..."); 1380 DBG("JOB3...");
1380 _e_comp_render_queue(cw->c); 1381 _e_comp_render_queue(cw->c);
1381} 1382}
@@ -2400,12 +2401,12 @@ _e_comp_win_show(E_Comp_Win *cw)
2400 cw->c->animating++; 2401 cw->c->animating++;
2401 } 2402 }
2402 cw->animating = 1; 2403 cw->animating = 1;
2403 if (!cw->real_obj) _e_comp_win_render_queue(cw); 2404 _e_comp_win_render_queue(cw);
2404 2405
2405 cw->pending_count++; 2406 cw->pending_count++;
2406 _e_comp_event_source_visibility(cw); 2407 _e_comp_event_source_visibility(cw);
2407 } 2408 }
2408 if (!cw->real_obj) _e_comp_win_render_queue(cw); 2409 _e_comp_win_render_queue(cw);
2409 if (!cw->shape) return; 2410 if (!cw->shape) return;
2410 cw->shape->visible = 0; 2411 cw->shape->visible = 0;
2411 e_container_shape_show(cw->shape); 2412 e_container_shape_show(cw->shape);
@@ -2667,7 +2668,7 @@ _e_comp_win_configure(E_Comp_Win *cw, int x, int y, int w, int h, int border)
2667 _e_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0); 2668 _e_comp_win_damage(cw, 0, 0, cw->w, cw->h, 0);
2668 } 2669 }
2669 if ((cw->input_only) || (cw->invalid)) return; 2670 if ((cw->input_only) || (cw->invalid)) return;
2670 if (!cw->real_obj) _e_comp_win_render_queue(cw); 2671 _e_comp_win_render_queue(cw);
2671 } 2672 }
2672 /* need to block move/resize of the edje for real objects so the external object doesn't 2673 /* need to block move/resize of the edje for real objects so the external object doesn't
2673 * accidentally get shown and block our show callback 2674 * accidentally get shown and block our show callback