enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elementary/flip - fix the flip page to not flip on a direction if the direction is disabled.

This commit is contained in:
ChunEon Park 2013-07-26 21:12:27 +09:00
parent 26a8472a45
commit 970257d3fc
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/ChangeLog
View File

@ -1515,3 +1515,8 @@
* File Selector : Support elm_object_part_text_set() for the ok, cancel
part to change the OK, Cancel button label.
2013-07-26 ChunEon Park (Hermet)
* Flip : Fix the flip page to not flip on a direction if the direction
is disabled.

1
legacy/elementary/NEWS
View File

@ -265,6 +265,7 @@ Fixes:
* Entry: Change the keyboard mode only if the imf is not available. If the
imf is available, the keyboard mode should be decided by ime, but not entry.
This prevents the asynchronous states between ime and conformant.
* Flip : Fix the flip page to not flip on a direction if the direction is disabled.
Removals:

24
legacy/elementary/src/lib/elm_flip.c
View File

@ -1578,8 +1578,8 @@ _up_cb(void *data,
if (ev->button != 1) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
sd->down = 0;
if (!sd->started) return;
evas_object_geometry_get(data, &x, &y, &w, &h);
sd->x = ev->canvas.x - x;
sd->y = ev->canvas.y - y;
@ -1633,7 +1633,6 @@ _move_cb(void *data,
Evas_Coord x, y, w, h;
ELM_FLIP_DATA_GET(fl, sd);
if (!sd->down) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
evas_object_geometry_get(data, &x, &y, &w, &h);
@ -1653,14 +1652,27 @@ _move_cb(void *data,
sd->dir = ELM_FLIP_DIRECTION_LEFT;
if ((sd->x > (w / 2)) &&
(dx < 0) && (abs(dx) > abs(dy)))
sd->dir = ELM_FLIP_DIRECTION_LEFT;
{
sd->dir = ELM_FLIP_DIRECTION_LEFT;
if (!sd->dir_enabled[ELM_FLIP_DIRECTION_LEFT]) return;
}
else if ((sd->x < (w / 2)) && (dx >= 0) &&
(abs(dx) > abs(dy)))
sd->dir = ELM_FLIP_DIRECTION_RIGHT;
{
sd->dir = ELM_FLIP_DIRECTION_RIGHT;
if (!sd->dir_enabled[ELM_FLIP_DIRECTION_RIGHT]) return;
}
else if ((sd->y > (h / 2)) && (dy < 0) && (abs(dy) >= abs(dx)))
sd->dir = ELM_FLIP_DIRECTION_UP;
{
sd->dir = ELM_FLIP_DIRECTION_UP;
if (!sd->dir_enabled[ELM_FLIP_DIRECTION_UP]) return;
}
else if ((sd->y < (h / 2)) && (dy >= 0) && (abs(dy) >= abs(dx)))
sd->dir = ELM_FLIP_DIRECTION_DOWN; // down
{
sd->dir = ELM_FLIP_DIRECTION_DOWN;
if (!sd->dir_enabled[ELM_FLIP_DIRECTION_DOWN]) return;
}
sd->started = EINA_TRUE;
if (sd->intmode == ELM_FLIP_INTERACTION_PAGE)
sd->pageflip = EINA_TRUE;