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

dont use mouse out hide timer for edge popup. add config option later 

reduce slide resistance


SVN revision: 49227
This commit is contained in:
Hannes Janetzek 2010-05-27 09:42:16 +00:00
parent c796422e36
commit 06bfeb30a0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/everything/evry.c
View File

@ -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); input_window = ecore_x_window_input_new(zone->container->win, 0, 0, 1, 1);
ecore_x_window_show(input_window); 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)) if (!e_grabinput_get(input_window, 0, input_window))
return 0; return 0;
@ -271,7 +271,7 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params)
(ECORE_EVENT_MOUSE_WHEEL, (ECORE_EVENT_MOUSE_WHEEL,
_evry_cb_mouse, win)); _evry_cb_mouse, win));
if (edge) if (0) /* (edge) */
{ {
win->handlers = eina_list_append win->handlers = eina_list_append
(win->handlers, ecore_event_handler_add (win->handlers, ecore_event_handler_add

6
src/modules/everything/evry_view.c
View File

@ -1373,6 +1373,8 @@ _view_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info)
} }
} }
#define SLIDE_RESISTANCE 80
static void static void
_view_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info) _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) && if ((sd->mouse_button == 1) &&
(sd->cur_item == sd->it_down)) (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->it_down = NULL;
sd->mouse_x = 0; sd->mouse_x = 0;
@ -1426,7 +1428,7 @@ _view_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
else else
evry_selectors_switch(-1, EINA_TRUE); 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,into", "e");
edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e"); edje_object_signal_emit(sd->view->bg, "e,action,hide,back", "e");