jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create kbd on current zone. 

Formatting.



SVN revision: 44619
This commit is contained in:
Christopher Michael 2009-12-21 03:54:41 +00:00
parent 7fa3653854
commit 652da596a2
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/illume2/e_mod_layout.c
View File

@ -624,9 +624,10 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
bd->placed = 1; bd->placed = 1;
bd->client.e.state.centered = 0; bd->client.e.state.centered = 0;
/*
if (!((bd->need_fullscreen) || (bd->fullscreen))) if (!((bd->need_fullscreen) || (bd->fullscreen)))
{ {
/*
bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh; bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh;
bd->client.w = bd->w; bd->client.h = bd->h; bd->client.w = bd->w; bd->client.h = bd->h;
if ((pbx != bd->x) || (pby != bd->y) || if ((pbx != bd->x) || (pby != bd->y) ||
@ -636,11 +637,9 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
bd->changes.pos = 1; bd->changes.pos = 1;
bd->changes.size = 1; bd->changes.size = 1;
} }
*/
} }
else else
{ {
/*
bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh; bd->x = zx; bd->y = zy; bd->w = zw; bd->h = zh;
bd->client.w = bd->w; bd->client.h = bd->h; bd->client.w = bd->w; bd->client.h = bd->h;
if ((pbx != bd->x) || (pby != bd->y) || if ((pbx != bd->x) || (pby != bd->y) ||
@ -660,8 +659,8 @@ _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2)
bd->changes.pos = 1; bd->changes.pos = 1;
bd->changes.size = 1; bd->changes.size = 1;
} }
*/
} }
*/
if (bd->remember) if (bd->remember)
{ {
e_remember_unuse(bd->remember); e_remember_unuse(bd->remember);

3
src/modules/illume2/e_mod_layout_illume.c
View File

@ -364,7 +364,8 @@ _zone_layout_dual(E_Border *bd)
else else
_zone_layout_dual_top_custom(bd); _zone_layout_dual_top_custom(bd);
} }
else if (il_cfg->policy.mode.side == 1) _zone_layout_dual_left(bd); else if (il_cfg->policy.mode.side == 1)
_zone_layout_dual_left(bd);
} }
static void static void

5
src/modules/illume2/e_mod_main.c
View File

@ -18,6 +18,8 @@ EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume2" };
EAPI void * EAPI void *
e_modapi_init(E_Module *m) e_modapi_init(E_Module *m)
{ {
E_Container *con;
/* init the config subsystem */ /* init the config subsystem */
if (!il_config_init(m)) return NULL; if (!il_config_init(m)) return NULL;
@ -32,8 +34,9 @@ e_modapi_init(E_Module *m)
e_mod_layout_init(m); e_mod_layout_init(m);
/* create a new keyboard */ /* create a new keyboard */
con = e_container_current_get(e_manager_current_get());
kbd = kbd =
e_kbd_new(e_util_container_zone_number_get(0, 0), m->dir, m->dir, m->dir); e_kbd_new(e_zone_current_get(con), m->dir, m->dir, m->dir);
/* show the keyboard if needed */ /* show the keyboard if needed */
e_kbd_show(kbd); e_kbd_show(kbd);