forked from enlightenment/enlightenment
fill the icon name on mouse-in, to catch changed icons
SVN revision: 27740
This commit is contained in:
parent
96451d164e
commit
74f9fa0bf6
|
@ -90,6 +90,7 @@ static IBox_Icon *_ibox_icon_at_coord(IBox *b, Evas_Coord x, Evas_Coord y);
|
||||||
static IBox_Icon *_ibox_icon_new(IBox *b, E_Border *bd);
|
static IBox_Icon *_ibox_icon_new(IBox *b, E_Border *bd);
|
||||||
static void _ibox_icon_free(IBox_Icon *ic);
|
static void _ibox_icon_free(IBox_Icon *ic);
|
||||||
static void _ibox_icon_fill(IBox_Icon *ic);
|
static void _ibox_icon_fill(IBox_Icon *ic);
|
||||||
|
static void _ibox_icon_fill_label(IBox_Icon *ic);
|
||||||
static void _ibox_icon_empty(IBox_Icon *ic);
|
static void _ibox_icon_empty(IBox_Icon *ic);
|
||||||
static void _ibox_icon_signal_emit(IBox_Icon *ic, char *sig, char *src);
|
static void _ibox_icon_signal_emit(IBox_Icon *ic, char *sig, char *src);
|
||||||
//static IBox *_ibox_zone_find(E_Zone *zone);
|
//static IBox *_ibox_zone_find(E_Zone *zone);
|
||||||
|
@ -523,8 +524,6 @@ _ibox_icon_free(IBox_Icon *ic)
|
||||||
static void
|
static void
|
||||||
_ibox_icon_fill(IBox_Icon *ic)
|
_ibox_icon_fill(IBox_Icon *ic)
|
||||||
{
|
{
|
||||||
char *label;
|
|
||||||
|
|
||||||
ic->o_icon = e_border_icon_add(ic->border, evas_object_evas_get(ic->ibox->o_box));
|
ic->o_icon = e_border_icon_add(ic->border, evas_object_evas_get(ic->ibox->o_box));
|
||||||
edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon);
|
edje_object_part_swallow(ic->o_holder, "e.swallow.content", ic->o_icon);
|
||||||
evas_object_pass_events_set(ic->o_icon, 1);
|
evas_object_pass_events_set(ic->o_icon, 1);
|
||||||
|
@ -534,6 +533,14 @@ _ibox_icon_fill(IBox_Icon *ic)
|
||||||
evas_object_pass_events_set(ic->o_icon2, 1);
|
evas_object_pass_events_set(ic->o_icon2, 1);
|
||||||
evas_object_show(ic->o_icon2);
|
evas_object_show(ic->o_icon2);
|
||||||
|
|
||||||
|
_ibox_icon_fill_label(ic);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_ibox_icon_fill_label(IBox_Icon *ic)
|
||||||
|
{
|
||||||
|
char *label;
|
||||||
|
|
||||||
switch (ic->ibox->icon_label)
|
switch (ic->ibox->icon_label)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -634,7 +641,10 @@ _ibox_cb_icon_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
|
||||||
ic = data;
|
ic = data;
|
||||||
_ibox_icon_signal_emit(ic, "e,state,focused", "e");
|
_ibox_icon_signal_emit(ic, "e,state,focused", "e");
|
||||||
if (ic->ibox->show_label)
|
if (ic->ibox->show_label)
|
||||||
|
{
|
||||||
|
_ibox_icon_fill_label(ic);
|
||||||
_ibox_icon_signal_emit(ic, "e,action,show,label", "e");
|
_ibox_icon_signal_emit(ic, "e,action,show,label", "e");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue