aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2018-08-20 11:00:09 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-08-20 11:00:09 -0400
commit9e7d0d03e4ce54038c3f1659d9206e2614f51866 (patch)
tree9a9f16703d700c51e0ca9c920c7556a70e684856 /src/lib/elementary/efl_ui_win.c
parentevas textblock: add/apply cursor cluster APIs based on grapheme cluster (diff)
downloadefl-9e7d0d03e4ce54038c3f1659d9206e2614f51866.tar.gz
Revert "elm/win: move trigger for "shot" to first pre-render callback"
Summary: This reverts commit 93228108efaf6097ac680664bdb9158b5cf57499. The original commit resulted in a hang during the use of the shot engine in our make doc target. During the doc run we generate screenshots for the documentation using the shot engine. It is not a clean revert as other things changed since this got in, but I verified that the screenshots for the documentation is generated correctly again. This might leave open the original issue https://phab.enlightenment.org/T6929 which the now reverted commit tried to address. Fixes https://phab.enlightenment.org/T7166 Reviewers: zmike, JackDanielZ, xavi Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T7166 Differential Revision: https://phab.enlightenment.org/D6873
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 29dce4dabb..b4307da693 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1031,7 +1031,6 @@ _elm_win_pre_render(Ecore_Evas *ee)
ecore_x_window_shape_input_rectangle_set(sd->x.xwin, 0, 0, 0, 0);
#endif
sd->first_draw = EINA_TRUE;
- if (sd->shot.info) _shot_handle(sd);
}
if (sd->deferred_resize_job)
{
@@ -2386,6 +2385,9 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
}
_elm_win_state_eval(NULL);
}
+
+ if (sd->shot.info) _shot_handle(sd);
+
if (!sd->first_draw) return;
if (sd->frame_obj)
{