Fix Ibar Icon Autoscrolling if Follower is disabled

SVN revision: 17331
This commit is contained in:
Christopher Michael 2005-10-08 19:27:31 +00:00
parent b194b35b2c
commit 23ccb27334
1 changed files with 6 additions and 4 deletions

View File

@ -671,7 +671,7 @@ static IBar_Icon *
_ibar_icon_new(IBar_Bar *ibb, E_App *a) _ibar_icon_new(IBar_Bar *ibb, E_App *a)
{ {
IBar_Icon *ic; IBar_Icon *ic;
char *str; // char *str;
Evas_Object *o; Evas_Object *o;
Evas_Coord w, h; Evas_Coord w, h;
@ -739,12 +739,13 @@ _ibar_icon_new(IBar_Bar *ibb, E_App *a)
w, h /* max */ w, h /* max */
); );
/*
str = (char *)edje_object_data_get(ic->icon_object, "raise_on_hilight"); str = (char *)edje_object_data_get(ic->icon_object, "raise_on_hilight");
if (str) if (str)
{ {
if (atoi(str) == 1) ic->raise_on_hilight = 1; if (atoi(str) == 1) ic->raise_on_hilight = 1;
} }
*/
edje_object_signal_emit(ic->bg_object, "passive", ""); edje_object_signal_emit(ic->bg_object, "passive", "");
edje_object_signal_emit(ic->overlay_object, "passive", ""); edje_object_signal_emit(ic->overlay_object, "passive", "");
return ic; return ic;
@ -1469,12 +1470,13 @@ _ibar_bar_cb_animator(void *data)
Evas_Coord x, y, w, h, mw, mh; Evas_Coord x, y, w, h, mw, mh;
ibb = data; ibb = data;
if (!ibb->overlay_object)
/* if (!ibb->overlay_object)
{ {
ibb->animator = NULL; ibb->animator = NULL;
return 0; return 0;
} }
*/
if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM) || if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM) ||
(e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP)) (e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP))
{ {