vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reshuffle all notifications on a notification merge 

improves layout when a notification's size changes due to merged text
being larger than original text
This commit is contained in:
Mike Blumenkrantz 2015-12-07 18:01:07 -05:00
parent 31157dadcc
commit 2bff9611c3
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/modules/notification/e_mod_popup.c
View File

@ -233,6 +233,26 @@ _notification_popup_merge(E_Notification_Notify *n)
return popup;
}
static void
_notification_reshuffle_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Popup_Data *popup;
Eina_List *l, *l2;
int pos = 0;
EINA_LIST_FOREACH_SAFE(notification_cfg->popups, l, l2, popup)
{
if (popup->theme == obj)
{
popup->pending = 0;
_notification_popdown(popup, 0);
notification_cfg->popups = eina_list_remove_list(notification_cfg->popups, l);
}
else
pos = _notification_popup_place(popup, pos);
}
next_pos = pos;
}
void
notification_popup_notify(E_Notification_Notify *n,
@ -276,7 +296,10 @@ notification_popup_notify(E_Notification_Notify *n,
else if (!n->replaces_id)
{
if ((popup = _notification_popup_merge(n)))
_notification_popup_refresh(popup);
{
_notification_popup_refresh(popup);
_notification_reshuffle_cb(NULL, NULL, NULL, NULL);
}
}
if (!popup)
@ -685,27 +708,6 @@ _notification_popup_find(unsigned int id)
return NULL;
}
static void
_notification_reshuffle_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Popup_Data *popup;
Eina_List *l, *l2;
int pos = 0;
EINA_LIST_FOREACH_SAFE(notification_cfg->popups, l, l2, popup)
{
if (popup->theme == obj)
{
popup->pending = 0;
_notification_popdown(popup, 0);
notification_cfg->popups = eina_list_remove_list(notification_cfg->popups, l);
}
else
pos = _notification_popup_place(popup, pos);
}
next_pos = pos;
}
static void
_notification_popup_del(unsigned int id,
E_Notification_Notify_Closed_Reason reason)