flip, index: Renamed smart data member 'down' to 'mouse_down' and used
EINA_TRUE/FALSE. This commit is for consistency inside elementary.
This commit is contained in:
parent
ab71bc5750
commit
b9a1047845
|
@ -1587,7 +1587,7 @@ _down_cb(void *data,
|
||||||
if (ev->button != 1) return;
|
if (ev->button != 1) return;
|
||||||
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
||||||
ELM_SAFE_FREE(sd->animator, ecore_animator_del);
|
ELM_SAFE_FREE(sd->animator, ecore_animator_del);
|
||||||
sd->down = EINA_TRUE;
|
sd->mouse_down = EINA_TRUE;
|
||||||
sd->started = EINA_FALSE;
|
sd->started = EINA_FALSE;
|
||||||
evas_object_geometry_get(data, &x, &y, &w, &h);
|
evas_object_geometry_get(data, &x, &y, &w, &h);
|
||||||
sd->x = ev->canvas.x - x;
|
sd->x = ev->canvas.x - x;
|
||||||
|
@ -1613,7 +1613,7 @@ _up_cb(void *data,
|
||||||
|
|
||||||
if (ev->button != 1) return;
|
if (ev->button != 1) return;
|
||||||
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
||||||
sd->down = 0;
|
sd->mouse_down = EINA_FALSE;
|
||||||
if (!sd->started) return;
|
if (!sd->started) return;
|
||||||
evas_object_geometry_get(data, &x, &y, &w, &h);
|
evas_object_geometry_get(data, &x, &y, &w, &h);
|
||||||
sd->x = ev->canvas.x - x;
|
sd->x = ev->canvas.x - x;
|
||||||
|
@ -1668,7 +1668,7 @@ _move_cb(void *data,
|
||||||
Evas_Coord x, y, w, h;
|
Evas_Coord x, y, w, h;
|
||||||
|
|
||||||
ELM_FLIP_DATA_GET(fl, sd);
|
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;
|
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
|
||||||
evas_object_geometry_get(data, &x, &y, &w, &h);
|
evas_object_geometry_get(data, &x, &y, &w, &h);
|
||||||
sd->x = ev->cur.canvas.x - x;
|
sd->x = ev->cur.canvas.x - x;
|
||||||
|
|
|
@ -686,7 +686,7 @@ _on_mouse_down(void *data,
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
|
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
|
||||||
|
|
||||||
if (ev->button != 1) return;
|
if (ev->button != 1) return;
|
||||||
sd->down = 1;
|
sd->mouse_down = EINA_TRUE;
|
||||||
evas_object_geometry_get(wd->resize_obj, &x, &y, &w, NULL);
|
evas_object_geometry_get(wd->resize_obj, &x, &y, &w, NULL);
|
||||||
sd->dx = ev->canvas.x - x;
|
sd->dx = ev->canvas.x - x;
|
||||||
sd->dy = ev->canvas.y - y;
|
sd->dy = ev->canvas.y - y;
|
||||||
|
@ -716,7 +716,7 @@ _on_mouse_up(void *data,
|
||||||
ELM_INDEX_DATA_GET(data, sd);
|
ELM_INDEX_DATA_GET(data, sd);
|
||||||
|
|
||||||
if (ev->button != 1) return;
|
if (ev->button != 1) return;
|
||||||
sd->down = 0;
|
sd->mouse_down = EINA_FALSE;
|
||||||
item = elm_index_selected_item_get(data, sd->level);
|
item = elm_index_selected_item_get(data, sd->level);
|
||||||
if (item)
|
if (item)
|
||||||
{
|
{
|
||||||
|
@ -746,7 +746,7 @@ _on_mouse_move(void *data,
|
||||||
ELM_INDEX_DATA_GET(data, sd);
|
ELM_INDEX_DATA_GET(data, sd);
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
|
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);
|
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
|
||||||
evas_object_geometry_get(wd->resize_obj, &x, &y, &w, NULL);
|
evas_object_geometry_get(wd->resize_obj, &x, &y, &w, NULL);
|
||||||
x = ev->cur.canvas.x - x;
|
x = ev->cur.canvas.x - x;
|
||||||
|
@ -792,7 +792,7 @@ _on_mouse_in_access(void *data,
|
||||||
{
|
{
|
||||||
ELM_INDEX_DATA_GET(data, sd);
|
ELM_INDEX_DATA_GET(data, sd);
|
||||||
|
|
||||||
if (sd->down) return;
|
if (sd->mouse_down) return;
|
||||||
|
|
||||||
if (!sd->autohide_disabled)
|
if (!sd->autohide_disabled)
|
||||||
{
|
{
|
||||||
|
|
|
@ -44,7 +44,7 @@ struct _Elm_Flip_Smart_Data
|
||||||
|
|
||||||
Eina_Bool state : 1;
|
Eina_Bool state : 1;
|
||||||
Eina_Bool next_state : 1;
|
Eina_Bool next_state : 1;
|
||||||
Eina_Bool down : 1;
|
Eina_Bool mouse_down : 1;
|
||||||
Eina_Bool finish : 1;
|
Eina_Bool finish : 1;
|
||||||
Eina_Bool started : 1;
|
Eina_Bool started : 1;
|
||||||
Eina_Bool backflip : 1;
|
Eina_Bool backflip : 1;
|
||||||
|
|
|
@ -35,7 +35,7 @@ struct _Elm_Index_Smart_Data
|
||||||
level. activeness means the box is
|
level. activeness means the box is
|
||||||
filled with contents. */
|
filled with contents. */
|
||||||
|
|
||||||
Eina_Bool down : 1;
|
Eina_Bool mouse_down : 1;
|
||||||
Eina_Bool horizontal : 1;
|
Eina_Bool horizontal : 1;
|
||||||
Eina_Bool autohide_disabled : 1;
|
Eina_Bool autohide_disabled : 1;
|
||||||
Eina_Bool indicator_disabled : 1;
|
Eina_Bool indicator_disabled : 1;
|
||||||
|
|
Loading…
Reference in New Issue