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

finally fix bug where gadgets on shelves would randomly reorder during drags 

ticket #everydamngadgetticketevercreated
This commit is contained in:
Mike Blumenkrantz 2013-12-05 12:27:46 -05:00
parent a0edbd69b0
commit 7a8ad8080e
3 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-12-04 Mike Blumenkrantz
* Fixed cases where gadgets would sometimes reorder randomly on shelves
2013-12-04 Mike Blumenkrantz 2013-12-04 Mike Blumenkrantz
* Fixed NoDisplay entries in Everything launcher * Fixed NoDisplay entries in Everything launcher

1
NEWS
View File

@ -267,3 +267,4 @@ Fixes:
* Fix unfocusing of disabled widgets * Fix unfocusing of disabled widgets
* Fix crash when activating e's restart from start gadget triggered menu * Fix crash when activating e's restart from start gadget triggered menu
* Further improve initial window placement coordinates * Further improve initial window placement coordinates
* Fixed cases where gadgets would sometimes reorder randomly on shelves

80
src/bin/e_gadcon.c
View File

@ -2320,7 +2320,7 @@ _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
Eina_List *l; Eina_List *l;
E_Gadcon_Client *gcc2; E_Gadcon_Client *gcc2;
Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0; Evas_Coord cx = 0, cy = 0, cw = 0, ch = 0;
int seq = 1; int i;
/* Check if the gadcon client is in place */ /* Check if the gadcon client is in place */
if (!gcc->hidden) if (!gcc->hidden)
@ -2337,44 +2337,64 @@ _e_gadcon_client_inject(E_Gadcon *gc, E_Gadcon_Client *gcc, int x, int y)
/* If x, y is not inside any gadcon client, seq will be 0 and it's position /* If x, y is not inside any gadcon client, seq will be 0 and it's position
* will later be used for placement. */ * will later be used for placement. */
gcc->state_info.seq = 0; gcc->state_info.seq = 0;
EINA_LIST_FOREACH(gc->clients, l, gcc2) for (i = 0; i < 2; i++)
{ {
if (gcc == gcc2) continue; /* two passes:
if (gcc2->hidden) continue; * - find sequence position to inject
if (gcc2->o_frame) * - update other gadget sequences
evas_object_geometry_get(gcc2->o_frame, &cx, &cy, &cw, &ch); */
else if (gcc2->o_base) EINA_LIST_FOREACH(gc->clients, l, gcc2)
evas_object_geometry_get(gcc2->o_base, &cx, &cy, &cw, &ch);
else return; /* make clang happy */
if (e_gadcon_layout_orientation_get(gc->o_container))
{ {
if (E_INSIDE(x, y, cx, cy, cw / 2, ch)) if (gcc == gcc2) continue;
if (i == 1)
{ {
gcc->state_info.seq = seq++; /* on second pass, increment all sequence numbers which are
gcc2->state_info.seq = seq++; * >= the injected gadget's sequence to get ordering right
*/
if (gcc2->state_info.seq >= gcc->state_info.seq)
gcc2->state_info.seq++;
continue;
} }
else if (E_INSIDE(x, y, cx + cw / 2, cy, cw / 2, ch)) if (gcc2->hidden) continue;
if (gcc2->o_frame)
evas_object_geometry_get(gcc2->o_frame, &cx, &cy, &cw, &ch);
else if (gcc2->o_base)
evas_object_geometry_get(gcc2->o_base, &cx, &cy, &cw, &ch);
else return; /* make clang happy */
if (e_gadcon_layout_orientation_get(gc->o_container))
{ {
gcc2->state_info.seq = seq++; /* inside left half of gadget */
gcc->state_info.seq = seq++; if (E_INSIDE(x, y, cx, cy, cw / 2, ch))
{
/* place before */
gcc->state_info.seq = gcc2->state_info.seq;
break;
}
/* inside right half of gadget */
else if (E_INSIDE(x, y, cx + cw / 2, cy, cw / 2, ch))
{
/* place after */
gcc->state_info.seq = gcc2->state_info.seq + 1;
break;
}
} }
else else
gcc2->state_info.seq = seq++;
}
else
{
if (E_INSIDE(x, y, cx, cy, cw, ch / 2))
{ {
gcc->state_info.seq = seq++; /* top half of gadget */
gcc2->state_info.seq = seq++; if (E_INSIDE(x, y, cx, cy, cw, ch / 2))
{
/* place before */
gcc->state_info.seq = gcc2->state_info.seq;
break;
}
/* bottom half of gadget */
else if (E_INSIDE(x, y, cx, cy + ch / 2, cw, ch / 2))
{
/* place after */
gcc->state_info.seq = gcc2->state_info.seq + 1;
break;
}
} }
else if (E_INSIDE(x, y, cx, cy + ch / 2, cw, ch / 2))
{
gcc2->state_info.seq = seq++;
gcc->state_info.seq = seq++;
}
else
gcc2->state_info.seq = seq++;
} }
} }
} }