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

Tiling2: Fixed setting of floating on non tiled desktops.

This commit is contained in:
Tom Hacohen 2014-02-12 12:20:56 +00:00
parent fe43bd7576
commit 555730c2bc
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/tiling/e_mod_tiling.c
View File

@ -342,7 +342,7 @@ tiling_e_client_move_resize_extra(E_Client *ec, int x, int y, int w, int h)
}
static Client_Extra *
tiling_entry_func(E_Client *ec)
tiling_entry_no_desk_func(E_Client *ec)
{
if (!ec)
return NULL;
@ -350,9 +350,6 @@ tiling_entry_func(E_Client *ec)
if (!is_tilable(ec))
return NULL;
if (!desk_should_tile_check(ec->desk))
return NULL;
Client_Extra *extra = eina_hash_find(_G.client_extras, &ec);
if (!extra)
@ -361,6 +358,20 @@ tiling_entry_func(E_Client *ec)
return extra;
}
static Client_Extra *
tiling_entry_func(E_Client *ec)
{
Client_Extra *extra = tiling_entry_no_desk_func(ec);
if (!extra)
return NULL;
if (!desk_should_tile_check(ec->desk))
return NULL;
return extra;
}
/* }}} */
/* Reorganize Stacks {{{ */
@ -556,7 +567,7 @@ _remove_client(E_Client *ec)
static void
toggle_floating(E_Client *ec)
{
Client_Extra *extra = tiling_entry_func(ec);
Client_Extra *extra = tiling_entry_no_desk_func(ec);
if (!extra)
{
@ -565,6 +576,9 @@ toggle_floating(E_Client *ec)
extra->floating = !extra->floating;
if (!desk_should_tile_check(ec->desk))
return;
/* This is the new state, act accordingly. */
if (extra->floating)
{