seoz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=ffce8a04aa07ba8639cf6c1c664db3a5492d0d15

commit ffce8a04aa07ba8639cf6c1c664db3a5492d0d15
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date:   Fri Nov 14 15:19:21 2014 +0900

    panel, segment_control: Use ev->canvas instead of ev->output.
    
    Even they are same it is recommended to use ev->canvas as it was
    actually intended for that purpose.
---
 src/lib/elm_panel.c           | 8 ++++----
 src/lib/elm_segment_control.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 31da9bc..21c5484 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -629,8 +629,8 @@ _event_mouse_up(void *data,
    Evas_Coord x, y, up_x, up_y, minw = 0, minh = 0;
    evas_object_geometry_get(data, &x, &y, NULL, NULL);
 
-   up_x = ev->output.x - x;
-   up_y = ev->output.y - y;
+   up_x = ev->canvas.x - x;
+   up_y = ev->canvas.y - y;
 
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
 
@@ -650,8 +650,8 @@ _on_mouse_down(void *data,
    Evas_Coord x, y, w, h;
    evas_object_geometry_get(obj, &x, &y, &w, &h);
 
-   sd->down_x = ev->output.x - x;
-   sd->down_y = ev->output.y - y;
+   sd->down_x = ev->canvas.x - x;
+   sd->down_y = ev->canvas.y - y;
 
    // if freeze state & mouse down on the edge
    // then set timer for un-freeze
diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 99a329f..4f69a17 100644
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -349,7 +349,7 @@ _on_mouse_up(void *data,
    ev = event_info;
    evas_object_geometry_get(VIEW(it), &x, &y, &w, &h);
 
-   if ((ev->canvas.x >= x) && (ev->output.x <= (x + w)) && (ev->canvas.y >= y)
+   if ((ev->canvas.x >= x) && (ev->canvas.x <= (x + w)) && (ev->canvas.y >= y)
        && (ev->canvas.y <= (y + h)))
      _segment_on(it);
    else

-- 


Reply via email to