From: Hannes Janetzek Date: Thu, 27 May 2010 09:42:16 +0000 (+0000) Subject: dont use mouse out hide timer for edge popup. add config option later X-Git-Tag: submit/efl/20131021.015651~7333 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06bfeb30a0108905da2d8574263392ff90d8894a;p=platform%2Fupstream%2Fenlightenment.git dont use mouse out hide timer for edge popup. add config option later reduce slide resistance SVN revision: 49227 --- diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 6035e30..b5804aa 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -207,7 +207,7 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params) input_window = ecore_x_window_input_new(zone->container->win, 0, 0, 1, 1); ecore_x_window_show(input_window); - if (edge == E_ZONE_EDGE_NONE) + /* if (edge == E_ZONE_EDGE_NONE) */ { if (!e_grabinput_get(input_window, 0, input_window)) return 0; @@ -271,7 +271,7 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params) (ECORE_EVENT_MOUSE_WHEEL, _evry_cb_mouse, win)); - if (edge) + if (0) /* (edge) */ { win->handlers = eina_list_append (win->handlers, ecore_event_handler_add diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c index d3cde86..546db9a 100644 --- a/src/modules/everything/evry_view.c +++ b/src/modules/everything/evry_view.c @@ -1373,6 +1373,8 @@ _view_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info) } } +#define SLIDE_RESISTANCE 80 + static void _view_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) { @@ -1416,7 +1418,7 @@ _view_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) if ((sd->mouse_button == 1) && (sd->cur_item == sd->it_down)) { - if (ev->cur.canvas.x - sd->mouse_x > 100) + if (ev->cur.canvas.x - sd->mouse_x > SLIDE_RESISTANCE) { sd->it_down = NULL; sd->mouse_x = 0; @@ -1426,7 +1428,7 @@ _view_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) else evry_selectors_switch(-1, EINA_TRUE); } - else if (sd->mouse_x - ev->cur.canvas.x > 100) + else if (sd->mouse_x - ev->cur.canvas.x > SLIDE_RESISTANCE) { edje_object_signal_emit(sd->view->bg, "e,action,hide,into", "e"); edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");