From 970257d3fc6ca4e99742c8dd291bb247d8891671 Mon Sep 17 00:00:00 2001
From: ChunEon Park <hermet@hermet.pe.kr>
Date: Fri, 26 Jul 2013 21:12:27 +0900
Subject: [PATCH] elementary/flip - fix the flip page to not flip on a
 direction if the direction is disabled.

---
 legacy/elementary/ChangeLog          |  5 +++++
 legacy/elementary/NEWS               |  1 +
 legacy/elementary/src/lib/elm_flip.c | 24 ++++++++++++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index beb68e3292..954dd502ab 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -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.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 178391b2a6..54354b9ea5 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -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:
 
diff --git a/legacy/elementary/src/lib/elm_flip.c b/legacy/elementary/src/lib/elm_flip.c
index 6a11233d46..5e12d4af63 100644
--- a/legacy/elementary/src/lib/elm_flip.c
+++ b/legacy/elementary/src/lib/elm_flip.c
@@ -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;