kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary / cursor, scroller, icon - removed white spaces 

SVN revision: 58248
This commit is contained in:
ChunEon Park 2011-04-01 11:08:31 +00:00
parent e88243c16a
commit 71d2f4b067
3 changed files with 420 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/elementary/src/lib/els_scroller.c
View File

@ -1574,7 +1574,7 @@ _smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
sd = data; sd = data;
ev = event_info; ev = event_info;
// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; // if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
if (_elm_config->thumbscroll_enable) if (_elm_config->thumbscroll_enable)
{ {
sd->down.hold = 0; sd->down.hold = 0;
@ -1703,7 +1703,7 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev
sd = data; sd = data;
ev = event_info; ev = event_info;
sd->down.hold_parent = 0; sd->down.hold_parent = 0;
// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; // if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
evas_post_event_callback_push(e, _smart_event_post_up, sd); evas_post_event_callback_push(e, _smart_event_post_up, sd);
// FIXME: respect elm_widget_scroll_hold_get of parent container // FIXME: respect elm_widget_scroll_hold_get of parent container
if (_elm_config->thumbscroll_enable) if (_elm_config->thumbscroll_enable)
@ -2017,7 +2017,7 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
sd = data; sd = data;
ev = event_info; ev = event_info;
// if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ; // if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->down.hold_parent = 1; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->down.hold_parent = 1;
evas_post_event_callback_push(e, _smart_event_post_move, sd); evas_post_event_callback_push(e, _smart_event_post_move, sd);
// FIXME: respect elm_widget_scroll_hold_get of parent container // FIXME: respect elm_widget_scroll_hold_get of parent container
@ -2085,10 +2085,10 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
} }
else else
{ {
// can_scroll(sd, LEFT); // can_scroll(sd, LEFT);
// can_scroll(sd, RIGHT); // can_scroll(sd, RIGHT);
// can_scroll(sd, UP); // can_scroll(sd, UP);
// can_scroll(sd, DOWN); // can_scroll(sd, DOWN);
sd->down.dir_x = 1; sd->down.dir_x = 1;
sd->down.dir_y = 1; sd->down.dir_y = 1;
} }
@ -2105,15 +2105,15 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
{ {
sd->down.want_dragged = 1; sd->down.want_dragged = 1;
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
// evas_event_feed_hold(e, 1, ev->timestamp, ev->data); // evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
// _smart_drag_start(sd->smart_obj); // _smart_drag_start(sd->smart_obj);
} }
if (sd->down.dragged) if (sd->down.dragged)
{ {
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
} }
// ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; // ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
// sd->down.dragged = 1; // sd->down.dragged = 1;
if (sd->down.dir_x) if (sd->down.dir_x)
x = sd->down.sx - (ev->cur.canvas.x - sd->down.x); x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
else else
@ -2165,9 +2165,9 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
if (!sd->down.hold_animator) if (!sd->down.hold_animator)
sd->down.hold_animator = sd->down.hold_animator =
ecore_animator_add(_smart_hold_animator, sd); ecore_animator_add(_smart_hold_animator, sd);
// printf("a %i %i\n", sd->down.hold_x, sd->down.hold_y); // printf("a %i %i\n", sd->down.hold_x, sd->down.hold_y);
// _smart_onhold_animator(sd); // _smart_onhold_animator(sd);
// elm_smart_scroller_child_pos_set(sd->smart_obj, x, y); // elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
} }
else else
{ {
@ -2233,7 +2233,7 @@ _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *
sd->down.onhold_tlast = 0.0; sd->down.onhold_tlast = 0.0;
sd->down.onhold_animator = ecore_animator_add(_smart_onhold_animator, sd); sd->down.onhold_animator = ecore_animator_add(_smart_onhold_animator, sd);
} }
// printf("b %i %i\n", sd->down.hold_x, sd->down.hold_y); // printf("b %i %i\n", sd->down.hold_x, sd->down.hold_y);
} }
else else
{ {
@ -2493,8 +2493,8 @@ _smart_scrollbar_size_adjust(Smart_Data *sd)
if (vx != mx) x = px; if (vx != mx) x = px;
if (vy != my) y = py; if (vy != my) y = py;
sd->pan_func.set(sd->pan_obj, x, y); sd->pan_func.set(sd->pan_obj, x, y);
// if ((px != 0) || (py != 0)) // if ((px != 0) || (py != 0))
// edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm"); // edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm");
} }
else else
{ {