Enlightenment CVS committal
Author : moom
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_main.c
Log Message:
* Fix some click issues
===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- e_mod_main.c 12 Sep 2006 15:13:03 -0000 1.32
+++ e_mod_main.c 12 Sep 2006 15:51:59 -0000 1.33
@@ -587,7 +587,7 @@
edje_object_signal_emit(e_slider_edje_object_get(win->slider),
"e,state,disabled", "e");
}
- }
+ }
}
if (inst->mixer->mix_sys->get_mute)
@@ -842,10 +842,7 @@
Mixer_Win_Simple *win;
Ecore_X_Event_Mouse_Button_Down *xev = event;
- if (!(win = data) || !E_INSIDE(xev->x, xev->y,
- win->window->x, win->window->y,
- win->window->w, win->window->h))
- return 1;
+ if (!(win = data)) return 1;
evas_event_feed_mouse_down(win->window->evas,
xev->button, EVAS_BUTTON_NONE,
@@ -860,17 +857,18 @@
{
Mixer_Win_Simple *win;
Ecore_X_Event_Mouse_Button_Up *xev = event;
+ int inside;
if (!(win = data)) return 1;
+
+ evas_event_feed_mouse_up(win->window->evas,
+ xev->button, EVAS_BUTTON_NONE,
+ xev->time, NULL);
- if (E_INSIDE(xev->x, xev->y, win->window->x, win->window->y,
- win->window->w, win->window->h))
- {
- evas_event_feed_mouse_up(win->window->evas,
- xev->button, EVAS_BUTTON_NONE,
- xev->time, NULL);
- }
- else if ((xev->button == 1) && (!win->first_mouse_up))
+ inside = E_INSIDE(xev->x, xev->y, win->window->x, win->window->y,
+ win->window->w, win->window->h);
+
+ if ((xev->button == 1) && (!win->first_mouse_up) && !inside)
_mixer_window_simple_pop_down(win->mixer->inst);
if ((xev->button == 1) && win->first_mouse_up)
@@ -886,10 +884,7 @@
Mixer_Win_Simple *win;
Ecore_X_Event_Mouse_Wheel *xev = event;
- if (!(win = data) || !E_INSIDE(xev->x, xev->y,
- win->window->x, win->window->y,
- win->window->w, win->window->h))
- return 1;
+ if (!(win = data)) return 1;
evas_event_feed_mouse_wheel(win->window->evas,
xev->direction, xev->z,
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
