e: fix windows being uniconified on desk show

SVN revision: 80392
This commit is contained in:
Boris Faure 2012-12-06 21:22:34 +00:00
parent df2d416f10
commit 5bf8a6cab3
2 changed files with 7 additions and 4 deletions

View File

@ -2186,7 +2186,7 @@ e_border_focus_set(E_Border *bd,
/* dont focus an iconified window. that's silly! */ /* dont focus an iconified window. that's silly! */
if (focus) if (focus)
{ {
if (bd->iconic) if ((bd->iconic) && (!bd->deskshow))
{ {
e_border_uniconify(bd); e_border_uniconify(bd);
if (!focus_track_frozen) if (!focus_track_frozen)

View File

@ -370,16 +370,19 @@ e_desk_deskshow(E_Zone *zone)
{ {
if (desk->deskshow_toggle) if (desk->deskshow_toggle)
{ {
if (bd->deskshow) e_border_uniconify(bd); if (bd->deskshow)
bd->deskshow = 0; {
bd->deskshow = 0;
e_border_uniconify(bd);
}
} }
else else
{ {
if (bd->iconic) continue; if (bd->iconic) continue;
if (bd->client.netwm.state.skip_taskbar) continue; if (bd->client.netwm.state.skip_taskbar) continue;
if (bd->user_skip_winlist) continue; if (bd->user_skip_winlist) continue;
e_border_iconify(bd);
bd->deskshow = 1; bd->deskshow = 1;
e_border_iconify(bd);
} }
} }
} }