No need to send_message to change state here, use existing functions.

No need to hide the clickwin twice.



SVN revision: 48625
This commit is contained in:
Christopher Michael 2010-05-05 16:00:25 +00:00
parent 36b527afa4
commit ba62246671
1 changed files with 12 additions and 13 deletions

View File

@ -184,11 +184,9 @@ _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__,
if (qp = e_illume_quickpanel_by_zone_get(zone)) if (qp = e_illume_quickpanel_by_zone_get(zone))
{ {
if (qp->visible) if (qp->visible)
ecore_x_e_illume_quickpanel_state_send(zone->black_win, e_mod_quickpanel_hide(qp);
ECORE_X_ILLUME_QUICKPANEL_STATE_OFF);
else else
ecore_x_e_illume_quickpanel_state_send(zone->black_win, e_mod_quickpanel_show(qp);
ECORE_X_ILLUME_QUICKPANEL_STATE_ON);
} }
} }
} }
@ -368,9 +366,6 @@ _e_mod_quickpanel_hide(E_Illume_Quickpanel *qp)
if (qp->timer) ecore_timer_del(qp->timer); if (qp->timer) ecore_timer_del(qp->timer);
qp->timer = NULL; qp->timer = NULL;
/* hide the input window */
_e_mod_quickpanel_clickwin_hide(qp);
/* if it's not visible, we can't hide it */ /* if it's not visible, we can't hide it */
if (!qp->visible) return; if (!qp->visible) return;
@ -421,12 +416,16 @@ _e_mod_quickpanel_cb_animate(void *data)
if (t == qp->len) if (t == qp->len)
{ {
qp->animator = NULL; qp->animator = NULL;
if (qp->visible) qp->visible = 0; if (qp->visible)
else qp->visible = 1; {
if (qp->visible) qp->visible = 0;
_e_mod_quickpanel_clickwin_show(qp); _e_mod_quickpanel_clickwin_hide(qp);
else }
_e_mod_quickpanel_clickwin_hide(qp); else
{
qp->visible = 1;
_e_mod_quickpanel_clickwin_show(qp);
}
return 0; return 0;
} }