fix shade unshade mumbo

SVN revision: 15318
This commit is contained in:
Carsten Haitzler 2005-06-14 10:52:05 +00:00
parent 0e22a36fcf
commit 3bbd1c65c6
3 changed files with 25 additions and 16 deletions

View File

@ -536,19 +536,19 @@ ACT_FN_GO(winlist)
{
if (!strcmp(params, "next"))
{
e_winlist_show(zone);
e_winlist_next();
if (!e_winlist_show(zone))
e_winlist_next();
}
else if (!strcmp(params, "prev"))
{
e_winlist_show(zone);
e_winlist_prev();
if (!e_winlist_show(zone))
e_winlist_prev();
}
}
else
{
e_winlist_show(zone);
e_winlist_next();
if (!e_winlist_show(zone))
e_winlist_next();
}
}
}
@ -569,20 +569,23 @@ ACT_FN_GO_MOUSE(winlist)
{
if (e_winlist_show(zone))
e_winlist_modifiers_set(ev->modifiers);
e_winlist_next();
else
e_winlist_next();
}
else if (!strcmp(params, "prev"))
{
if (e_winlist_show(zone))
e_winlist_modifiers_set(ev->modifiers);
e_winlist_prev();
else
e_winlist_prev();
}
}
else
{
if (e_winlist_show(zone))
e_winlist_modifiers_set(ev->modifiers);
e_winlist_next();
else
e_winlist_next();
}
}
}
@ -603,20 +606,23 @@ ACT_FN_GO_KEY(winlist)
{
if (e_winlist_show(zone))
e_winlist_modifiers_set(ev->modifiers);
e_winlist_next();
else
e_winlist_next();
}
else if (!strcmp(params, "prev"))
{
if (e_winlist_show(zone))
e_winlist_modifiers_set(ev->modifiers);
e_winlist_prev();
else
e_winlist_prev();
}
}
else
{
if (e_winlist_show(zone))
e_winlist_modifiers_set(ev->modifiers);
e_winlist_next();
else
e_winlist_next();
}
}
}

View File

@ -4271,8 +4271,8 @@ _e_border_shade_animator(void *data)
bd->changed = 1;
/* we're done */
if ( (bd->shaded && (bd->shade.val == 1)) ||
(!(bd->shaded) && (bd->shade.val == 0)) )
if ((bd->shaded && (bd->shade.val == 1)) ||
(!(bd->shaded) && (bd->shade.val == 0)) )
{
E_Event_Border_Resize *ev;

View File

@ -134,7 +134,7 @@ e_winlist_show(E_Zone *zone)
bd = e_border_focused_get();
if (bd) e_border_focus_set(bd, 0, 0);
_e_winlist_activate_nth(0);
_e_winlist_activate_nth(1);
evas_event_thaw(winlist->evas);
_e_winlist_size_adjust();
@ -459,7 +459,10 @@ _e_winlist_activate(void)
if (ww->border->desk) e_desk_show(ww->border->desk);
ok = 1;
}
if ((ww->border->shaded) &&
if (((ww->border->shaded) ||
((ww->border->changes.shaded) &&
(ww->border->shade.val != ww->border->shaded) &&
(ww->border->shade.val))) &&
(ww->border->desk == e_desk_current_get(winlist->zone)) &&
(e_config->winlist_list_uncover_while_selecting))
{