Revert "elm/win: move trigger for "shot" to first pre-render callback"

Summary:
This reverts commit 93228108ef.

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 T6929 which
the now reverted commit tried to address.

Fixes T7166

Reviewers: zmike, JackDanielZ, xavi

Reviewed By: zmike

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7166

Differential Revision: https://phab.enlightenment.org/D6873
This commit is contained in:
Stefan Schmidt 2018-08-20 11:00:09 -04:00 committed by Mike Blumenkrantz
parent 517018e008
commit 9e7d0d03e4
1 changed files with 3 additions and 1 deletions

View File

@ -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)
{