forked from enlightenment/enlightenment
Enlightenment: Luncher gadget - don't allow .desktop actions on non .desktop icons.
This commit is contained in:
parent
2f75513396
commit
9f43e67a73
|
@ -272,6 +272,7 @@ _bar_icon_menu_add_clicked(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, vo
|
||||||
|
|
||||||
evas_object_del(box);
|
evas_object_del(box);
|
||||||
elm_ctxpopup_dismiss(popup);
|
elm_ctxpopup_dismiss(popup);
|
||||||
|
if (ic->desktop)
|
||||||
e_order_append(ic->inst->order, ic->desktop);
|
e_order_append(ic->inst->order, ic->desktop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -284,6 +285,7 @@ _bar_icon_menu_remove_clicked(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
|
||||||
|
|
||||||
evas_object_del(box);
|
evas_object_del(box);
|
||||||
elm_ctxpopup_dismiss(popup);
|
elm_ctxpopup_dismiss(popup);
|
||||||
|
if (ic->desktop)
|
||||||
e_order_remove(ic->inst->order, ic->desktop);
|
e_order_remove(ic->inst->order, ic->desktop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -296,6 +298,7 @@ _bar_icon_menu_properties_clicked(void *data, Evas *e EINA_UNUSED, Evas_Object *
|
||||||
|
|
||||||
evas_object_del(box);
|
evas_object_del(box);
|
||||||
elm_ctxpopup_dismiss(popup);
|
elm_ctxpopup_dismiss(popup);
|
||||||
|
if (ic->desktop)
|
||||||
e_desktop_edit(ic->desktop);
|
e_desktop_edit(ic->desktop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -561,14 +564,17 @@ _bar_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS
|
||||||
evas_object_show(sep);
|
evas_object_show(sep);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (ic->desktop)
|
||||||
|
{
|
||||||
item = _bar_icon_menu_item_new(ic, popup, box, _("Icon Properties"), "preferences-applications");
|
item = _bar_icon_menu_item_new(ic, popup, box, _("Icon Properties"), "preferences-applications");
|
||||||
evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _bar_icon_menu_properties_clicked, ic);
|
evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _bar_icon_menu_properties_clicked, ic);
|
||||||
|
}
|
||||||
if (ic->in_order)
|
if (ic->in_order)
|
||||||
{
|
{
|
||||||
item = _bar_icon_menu_item_new(ic, popup, box, _("Remove From Bar"), "list-remove");
|
item = _bar_icon_menu_item_new(ic, popup, box, _("Remove From Bar"), "list-remove");
|
||||||
evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _bar_icon_menu_remove_clicked, ic);
|
evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _bar_icon_menu_remove_clicked, ic);
|
||||||
}
|
}
|
||||||
else
|
else if (!ic->in_order && ic->desktop)
|
||||||
{
|
{
|
||||||
item = _bar_icon_menu_item_new(ic, popup, box, _("Add To Bar"), "list-add");
|
item = _bar_icon_menu_item_new(ic, popup, box, _("Add To Bar"), "list-add");
|
||||||
evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _bar_icon_menu_add_clicked, ic);
|
evas_object_event_callback_add(item, EVAS_CALLBACK_MOUSE_UP, _bar_icon_menu_add_clicked, ic);
|
||||||
|
|
Loading…
Reference in New Issue