summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2014-03-22 17:54:49 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-03-22 17:54:49 +0900
commitd121d96ac7a2dd492abcdd6af5ff3de95a47b9d1 (patch)
treeadbbdfadfb736218ec8208f94d0951d7a9a2d7be
parent662f554422a462478fcf196f8ed8884423ca491a (diff)
downloadelementary-d121d96ac7a2dd492abcdd6af5ff3de95a47b9d1.tar.gz
flip, index: Renamed smart data member 'down' to 'mouse_down' and used
EINA_TRUE/FALSE. This commit is for consistency inside elementary.
-rw-r--r--src/lib/elm_flip.c6
-rw-r--r--src/lib/elm_index.c8
-rw-r--r--src/lib/elm_widget_flip.h2
-rw-r--r--src/lib/elm_widget_index.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 4cca0683a..da313db8b 100644
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -1587,7 +1587,7 @@ _down_cb(void *data,
if (ev->button != 1) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
ELM_SAFE_FREE(sd->animator, ecore_animator_del);
- sd->down = EINA_TRUE;
+ sd->mouse_down = EINA_TRUE;
sd->started = EINA_FALSE;
evas_object_geometry_get(data, &x, &y, &w, &h);
sd->x = ev->canvas.x - x;
@@ -1613,7 +1613,7 @@ _up_cb(void *data,
if (ev->button != 1) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
- sd->down = 0;
+ sd->mouse_down = EINA_FALSE;
if (!sd->started) return;
evas_object_geometry_get(data, &x, &y, &w, &h);
sd->x = ev->canvas.x - x;
@@ -1668,7 +1668,7 @@ _move_cb(void *data,
Evas_Coord x, y, w, h;
ELM_FLIP_DATA_GET(fl, sd);
- if (!sd->down) return;
+ if (!sd->mouse_down) return;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
evas_object_geometry_get(data, &x, &y, &w, &h);
sd->x = ev->cur.canvas.x - x;
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 01fb68371..3c2f9255c 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -686,7 +686,7 @@ _on_mouse_down(void *data,
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
if (ev->button != 1) return;
- sd->down = 1;
+ sd->mouse_down = EINA_TRUE;
evas_object_geometry_get(wd->resize_obj, &x, &y, &w, NULL);
sd->dx = ev->canvas.x - x;
sd->dy = ev->canvas.y - y;
@@ -716,7 +716,7 @@ _on_mouse_up(void *data,
ELM_INDEX_DATA_GET(data, sd);
if (ev->button != 1) return;
- sd->down = 0;
+ sd->mouse_down = EINA_FALSE;
item = elm_index_selected_item_get(data, sd->level);
if (item)
{
@@ -746,7 +746,7 @@ _on_mouse_move(void *data,
ELM_INDEX_DATA_GET(data, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
- if (!sd->down) return;
+ if (!sd->mouse_down) return;
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
evas_object_geometry_get(wd->resize_obj, &x, &y, &w, NULL);
x = ev->cur.canvas.x - x;
@@ -792,7 +792,7 @@ _on_mouse_in_access(void *data,
{
ELM_INDEX_DATA_GET(data, sd);
- if (sd->down) return;
+ if (sd->mouse_down) return;
if (!sd->autohide_disabled)
{
diff --git a/src/lib/elm_widget_flip.h b/src/lib/elm_widget_flip.h
index 1ffc300fb..5425bc360 100644
--- a/src/lib/elm_widget_flip.h
+++ b/src/lib/elm_widget_flip.h
@@ -44,7 +44,7 @@ struct _Elm_Flip_Smart_Data
Eina_Bool state : 1;
Eina_Bool next_state : 1;
- Eina_Bool down : 1;
+ Eina_Bool mouse_down : 1;
Eina_Bool finish : 1;
Eina_Bool started : 1;
Eina_Bool backflip : 1;
diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index 15116002e..a80ba0691 100644
--- a/src/lib/elm_widget_index.h
+++ b/src/lib/elm_widget_index.h
@@ -35,7 +35,7 @@ struct _Elm_Index_Smart_Data
level. activeness means the box is
filled with contents. */
- Eina_Bool down : 1;
+ Eina_Bool mouse_down : 1;
Eina_Bool horizontal : 1;
Eina_Bool autohide_disabled : 1;
Eina_Bool indicator_disabled : 1;