Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir     : e_modules/mixer


Modified Files:
        e_mod_main.c 


Log Message:
* Do not feed the events when the pop-up window is sliding


===================================================================
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_mod_main.c        12 Sep 2006 16:53:46 -0000      1.37
+++ e_mod_main.c        12 Sep 2006 21:00:38 -0000      1.38
@@ -844,7 +844,7 @@
    Mixer_Win_Simple *win;
    Ecore_X_Event_Mouse_Move *xev = event;
    
-   if (!(win = data)) return 1;
+   if (!(win = data) || (win->slide_timer)) return 1;
    
    evas_event_feed_mouse_move(win->window->evas,
                               xev->x - win->window->x, xev->y - win->window->y,
@@ -860,7 +860,7 @@
    Mixer_Win_Simple *win;
    Ecore_X_Event_Mouse_Button_Down *xev = event;
    
-   if (!(win = data)) return 1;
+   if (!(win = data) || (win->slide_timer)) return 1;
    
    evas_event_feed_mouse_down(win->window->evas,
                               xev->button, EVAS_BUTTON_NONE,
@@ -877,7 +877,7 @@
    Ecore_X_Event_Mouse_Button_Up *xev = event;
    int inside;
    
-   if (!(win = data)) return 1;
+   if (!(win = data) || (win->slide_timer)) return 1;
       
    evas_event_feed_mouse_up(win->window->evas,
                             xev->button, EVAS_BUTTON_NONE,
@@ -886,7 +886,7 @@
    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)
+   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)
@@ -902,7 +902,7 @@
    Mixer_Win_Simple *win;
    Ecore_X_Event_Mouse_Wheel *xev = event;
    
-   if (!(win = data)) return 1;
+   if (!(win = data) || (win->slide_timer)) 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

Reply via email to