enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Revert "e - restart window positioning - fix it" 

This reverts commit d0229b3652.

see following patches
This commit is contained in:
Mike Blumenkrantz 2016-02-08 13:38:19 -05:00
parent d0229b3652
commit 493f6f595b
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/e.h
View File

@ -313,7 +313,6 @@ extern E_API Eina_Bool starting;
extern E_API Eina_Bool stopping;
extern E_API Eina_Bool restart;
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 x_fatal;

15
src/bin/e_client.c
View File

@ -1876,17 +1876,10 @@ _e_client_eval(E_Client *ec)
}
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! */
ec->x = zx + ((zw - ec->w) / 2);
ec->y = zy + ((zh - ec->h) / 2);
ec->changes.pos = 1;
}
/* If an ec is placed out of bound, fix it! */
ec->x = zx + ((zw - ec->w) / 2);
ec->y = zy + ((zh - ec->h) / 2);
ec->changes.pos = 1;
}
/* Recreate state */

11
src/bin/e_comp_object.c
View File

@ -3286,15 +3286,8 @@ reshadow:
_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))
{
// 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->y = MAX(cw->ec->zone->y, cw->ec->client.y - cw->client_inset.t);
}
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);
}
/* this guarantees that we won't get blocked by the NOP check in the interceptor */
cw->y = cw->x = -99999;

2
src/bin/e_main.c
View File

@ -111,7 +111,6 @@ E_API Eina_Bool starting = EINA_TRUE;
E_API Eina_Bool stopping = EINA_FALSE;
E_API Eina_Bool restart = 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 double e_first_frame_start_time = -1;
@ -1059,7 +1058,6 @@ main(int argc, char **argv)
e_util_env_set("E_RESTART", "1");
TS("MAIN LOOP AT LAST");
e_main_loop_started = ecore_time_get();
if (!setjmp(x_fatal_buff))
ecore_main_loop_begin();
else