forked from enlightenment/enlightenment
Revert "e - restart window positioning - fix it"
This reverts commit d0229b3652
.
see following patches
This commit is contained in:
parent
d0229b3652
commit
493f6f595b
|
@ -313,7 +313,6 @@ extern E_API Eina_Bool starting;
|
||||||
extern E_API Eina_Bool stopping;
|
extern E_API Eina_Bool stopping;
|
||||||
extern E_API Eina_Bool restart;
|
extern E_API Eina_Bool restart;
|
||||||
extern E_API Eina_Bool e_nopause;
|
extern E_API Eina_Bool e_nopause;
|
||||||
extern E_API double e_main_loop_started;
|
|
||||||
|
|
||||||
extern E_API Eina_Bool e_precache_end;
|
extern E_API Eina_Bool e_precache_end;
|
||||||
extern E_API Eina_Bool x_fatal;
|
extern E_API Eina_Bool x_fatal;
|
||||||
|
|
|
@ -1876,18 +1876,11 @@ _e_client_eval(E_Client *ec)
|
||||||
}
|
}
|
||||||
else if (!E_INSIDE(ec->x, ec->y, zx, zy, zw, zh))
|
else if (!E_INSIDE(ec->x, ec->y, zx, zy, zw, zh))
|
||||||
{
|
{
|
||||||
// FIXME: this causes initial positioning of windows to be broken on restart
|
|
||||||
if (!((ecore_time_get() - e_main_loop_started) < 5.0))
|
|
||||||
// if during the startup phase and inital event burst
|
|
||||||
// big nasty hack - assume 5 seconds ... then DONT do this
|
|
||||||
// because otherwise windows just shuffle into the center
|
|
||||||
{
|
|
||||||
/* If an ec is placed out of bound, fix it! */
|
/* If an ec is placed out of bound, fix it! */
|
||||||
ec->x = zx + ((zw - ec->w) / 2);
|
ec->x = zx + ((zw - ec->w) / 2);
|
||||||
ec->y = zy + ((zh - ec->h) / 2);
|
ec->y = zy + ((zh - ec->h) / 2);
|
||||||
ec->changes.pos = 1;
|
ec->changes.pos = 1;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Recreate state */
|
/* Recreate state */
|
||||||
if (!ec->override)
|
if (!ec->override)
|
||||||
|
|
|
@ -3286,16 +3286,9 @@ reshadow:
|
||||||
_e_comp_smart_cb_frame_recalc(cw, cw->smart_obj, NULL);
|
_e_comp_smart_cb_frame_recalc(cw, cw->smart_obj, NULL);
|
||||||
if ((cw->x == -1) && (cw->y == -1) && cw->ec->new_client && (!cw->ec->placed))
|
if ((cw->x == -1) && (cw->y == -1) && cw->ec->new_client && (!cw->ec->placed))
|
||||||
{
|
{
|
||||||
// FIXME: this causes windows to move up by a titlebar height each restart
|
|
||||||
if (!((ecore_time_get() - e_main_loop_started) < 5.0))
|
|
||||||
// if during the startup phase and inital event burst
|
|
||||||
// big nasty hack - assume 5 seconds ... then DONT do this
|
|
||||||
// because every restart otherwise windows just shift up and up
|
|
||||||
{
|
|
||||||
cw->ec->x = MAX(cw->ec->zone->x, cw->ec->client.x - cw->client_inset.l);
|
cw->ec->x = MAX(cw->ec->zone->x, cw->ec->client.x - cw->client_inset.l);
|
||||||
cw->ec->y = MAX(cw->ec->zone->y, cw->ec->client.y - cw->client_inset.t);
|
cw->ec->y = MAX(cw->ec->zone->y, cw->ec->client.y - cw->client_inset.t);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
/* this guarantees that we won't get blocked by the NOP check in the interceptor */
|
/* this guarantees that we won't get blocked by the NOP check in the interceptor */
|
||||||
cw->y = cw->x = -99999;
|
cw->y = cw->x = -99999;
|
||||||
if (pbg)
|
if (pbg)
|
||||||
|
|
|
@ -111,7 +111,6 @@ E_API Eina_Bool starting = EINA_TRUE;
|
||||||
E_API Eina_Bool stopping = EINA_FALSE;
|
E_API Eina_Bool stopping = EINA_FALSE;
|
||||||
E_API Eina_Bool restart = EINA_FALSE;
|
E_API Eina_Bool restart = EINA_FALSE;
|
||||||
E_API Eina_Bool e_nopause = EINA_FALSE;
|
E_API Eina_Bool e_nopause = EINA_FALSE;
|
||||||
E_API double e_main_loop_started = 0.0;
|
|
||||||
EINTERN const char *e_first_frame = NULL;
|
EINTERN const char *e_first_frame = NULL;
|
||||||
EINTERN double e_first_frame_start_time = -1;
|
EINTERN double e_first_frame_start_time = -1;
|
||||||
|
|
||||||
|
@ -1059,7 +1058,6 @@ main(int argc, char **argv)
|
||||||
e_util_env_set("E_RESTART", "1");
|
e_util_env_set("E_RESTART", "1");
|
||||||
|
|
||||||
TS("MAIN LOOP AT LAST");
|
TS("MAIN LOOP AT LAST");
|
||||||
e_main_loop_started = ecore_time_get();
|
|
||||||
if (!setjmp(x_fatal_buff))
|
if (!setjmp(x_fatal_buff))
|
||||||
ecore_main_loop_begin();
|
ecore_main_loop_begin();
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue