fix initial dragable values

SVN revision: 12229

diff --git a/legacy/edje/data/src/e_logo.edc b/legacy/edje/data/src/e_logo.edc
index 317f7b4..9f37095 100644 (file)
--- a/legacy/edje/data/src/e_logo.edc
+++ b/legacy/edje/data/src/e_logo.edc
@@ -462,7 +462,7 @@ collections {
            mouse_events:  1;
            dragable {
               // drag in: DIR: ON/OFF STEPPING COUNT;
-              x:       -1 1 0;
+              x:        1 1 0;
               y:        1 1 0;
               confine: "background";
            }

diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 629639a..1ffdc0e 100644 (file)
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -262,7 +262,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
             if (_edje_block_break(ed)) break;
             if (rp->part->dragable.x < 0) rp->drag.val.x = 1.0;
             if (rp->part->dragable.y < 0) rp->drag.val.x = 1.0;
-            _edje_dragable_pos_set(ed, rp, 1.0, 1.0);
+            _edje_dragable_pos_set(ed, rp, rp->drag.val.x, rp->drag.val.y);
          }
        ed->dirty = 1;
        if ((evas_object_clipees_get(ed->clipper)) && 

diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 88f7caf..3bdcf62 100644 (file)
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -945,13 +945,13 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
        return;
      }
    if (rp->drag.down.count > 0) return;
-   if(rp->part->dragable.confine_id != -1)
-   {
-    if (dx < 0.0) dx = 0.0;
-    else if (dx > 1.0) dx = 1.0;
-    if (dy < 0.0) dy = 0.0;
-    else if (dy > 1.0) dy = 1.0;
-   }
+   if (rp->part->dragable.confine_id != -1)
+     {
+       if (dx < 0.0) dx = 0.0;
+       else if (dx > 1.0) dx = 1.0;
+       if (dy < 0.0) dy = 0.0;
+       else if (dy > 1.0) dy = 1.0;
+     }
    if (rp->part->dragable.x < 0) dx = 1.0 - dx;
    if (rp->part->dragable.y < 0) dy = 1.0 - dy;
    if ((rp->drag.val.x == dx) && (rp->drag.val.y == dy)) return;