forked from enlightenment/enlightenment
Tiling2: Fixed setting of floating on non tiled desktops.
This commit is contained in:
parent
fe43bd7576
commit
555730c2bc
|
@ -342,7 +342,7 @@ tiling_e_client_move_resize_extra(E_Client *ec, int x, int y, int w, int h)
|
||||||
}
|
}
|
||||||
|
|
||||||
static Client_Extra *
|
static Client_Extra *
|
||||||
tiling_entry_func(E_Client *ec)
|
tiling_entry_no_desk_func(E_Client *ec)
|
||||||
{
|
{
|
||||||
if (!ec)
|
if (!ec)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -350,9 +350,6 @@ tiling_entry_func(E_Client *ec)
|
||||||
if (!is_tilable(ec))
|
if (!is_tilable(ec))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (!desk_should_tile_check(ec->desk))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
Client_Extra *extra = eina_hash_find(_G.client_extras, &ec);
|
Client_Extra *extra = eina_hash_find(_G.client_extras, &ec);
|
||||||
|
|
||||||
if (!extra)
|
if (!extra)
|
||||||
|
@ -361,6 +358,20 @@ tiling_entry_func(E_Client *ec)
|
||||||
return extra;
|
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 {{{ */
|
/* Reorganize Stacks {{{ */
|
||||||
|
|
||||||
|
@ -556,7 +567,7 @@ _remove_client(E_Client *ec)
|
||||||
static void
|
static void
|
||||||
toggle_floating(E_Client *ec)
|
toggle_floating(E_Client *ec)
|
||||||
{
|
{
|
||||||
Client_Extra *extra = tiling_entry_func(ec);
|
Client_Extra *extra = tiling_entry_no_desk_func(ec);
|
||||||
|
|
||||||
if (!extra)
|
if (!extra)
|
||||||
{
|
{
|
||||||
|
@ -565,6 +576,9 @@ toggle_floating(E_Client *ec)
|
||||||
|
|
||||||
extra->floating = !extra->floating;
|
extra->floating = !extra->floating;
|
||||||
|
|
||||||
|
if (!desk_should_tile_check(ec->desk))
|
||||||
|
return;
|
||||||
|
|
||||||
/* This is the new state, act accordingly. */
|
/* This is the new state, act accordingly. */
|
||||||
if (extra->floating)
|
if (extra->floating)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue