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

elementary/elm_slider : Changed codes for not using feed events. This 

codes are for the feature that "mouse down on slider bar" -> "button move to
the down position" -> "button will be dragged by mouse move".


SVN revision: 66733
This commit is contained in:
WooHyun Jung 2012-01-02 08:56:19 +00:00
parent 58dcd21bf7
commit 78a49b8a3d
2 changed files with 74 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/elementary/data/themes/widgets/slider.edc
View File

@ -1231,7 +1231,6 @@ group { name: "elm/slider/horizontal/indicator/default";
script {
thumb_down();
}
}
program { name: "val_hide";
signal: "mouse,up,*";
@ -1240,6 +1239,20 @@ group { name: "elm/slider/horizontal/indicator/default";
thumb_up();
}
}
program { name: "indicator_show";
signal: "elm,state,indicator,show";
source: "elm";
script {
thumb_down();
}
}
program { name: "indicator_hide";
signal: "elm,state,indicator,hide";
source: "elm";
script {
thumb_up();
}
}
program {
name: "go_disabled";
signal: "elm,state,disabled";

77
legacy/elementary/src/lib/elm_slider.c
View File

@ -28,6 +28,7 @@ struct _Widget_Data
Eina_Bool horizontal : 1;
Eina_Bool inverted : 1;
Eina_Bool indicator_show : 1;
Eina_Bool spacer_down : 1;
};
#define ELM_SLIDER_INVERTED_FACTOR (-1.0)
@ -50,7 +51,9 @@ static void _drag_down(void *data, Evas_Object *obj,
const char *emission, const char *source);
static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
Evas_Callback_Type type, void *event_info);
static void _spacer_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
static void _spacer_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
static void _spacer_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
static void _spacer_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
static const char SIG_CHANGED[] = "changed";
static const char SIG_DELAY_CHANGED[] = "delay,changed";
@ -446,18 +449,15 @@ _drag_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE
}
static void
_spacer_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
_spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_Event_Mouse_Down *ev = event_info;
Evas_Coord x, y, w, h;
double button_x, button_y;
double prev_button_x, prev_button_y;
double button_x = 0.0, button_y = 0.0;
wd->spacer_down = EINA_TRUE;
evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider", &prev_button_x, &prev_button_y);
button_x = prev_button_x;
button_y = prev_button_y;
if (wd->horizontal)
{
button_x = ((double)ev->canvas.x - (double)x) / (double)w;
@ -470,16 +470,57 @@ _spacer_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
if (button_y > 1) button_y = 1;
if (button_y < 0) button_y = 0;
}
if (button_x != prev_button_x || button_y != prev_button_y)
{
edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", button_x, button_y);
}
edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", button_x, button_y);
_val_fetch(data);
evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
_units_set(data);
_indicator_set(data);
elm_widget_scroll_freeze_push(data);
edje_object_signal_emit(wd->slider, "elm,state,indicator,show", "elm");
}
//What is a purpose of these two mouse events?
//I don't know the reason but these calls cause infinite loop.
//So blocked them.
//evas_event_feed_mouse_cancel(e, 0, NULL);
//evas_event_feed_mouse_down(e, 1, EVAS_BUTTON_NONE, 0, NULL);
static void
_spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
Evas_Event_Mouse_Move *ev = event_info;
Evas_Coord x, y, w, h;
double button_x = 0.0, button_y = 0.0;
if (wd->spacer_down)
{
evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
if (wd->horizontal)
{
button_x = ((double)ev->cur.canvas.x - (double)x) / (double)w;
if (button_x > 1) button_x = 1;
if (button_x < 0) button_x = 0;
}
else
{
button_y = ((double)ev->cur.canvas.y - (double)y) / (double)h;
if (button_y > 1) button_y = 1;
if (button_y < 0) button_y = 0;
}
edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", button_x, button_y);
_val_fetch(data);
_units_set(data);
_indicator_set(data);
}
}
static void
_spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Widget_Data *wd = elm_widget_data_get(data);
if (wd->spacer_down) wd->spacer_down = EINA_FALSE;
_val_fetch(data);
evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
_units_set(data);
_indicator_set(data);
elm_widget_scroll_freeze_pop(data);
edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
}
static void
@ -712,7 +753,9 @@ elm_slider_add(Evas_Object *parent)
evas_object_pass_events_set(wd->spacer, EINA_TRUE);
elm_widget_sub_object_add(obj, wd->spacer);
edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer);
evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_DOWN, _spacer_cb, obj);
evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_DOWN, _spacer_down_cb, obj);
evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));