Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_menu.c
Log Message:
fix menu popups to behave mroe sanely with click-release-browse
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_menu.c 26 May 2005 15:30:10 -0000 1.33
+++ e_menu.c 16 Jun 2005 09:12:44 -0000 1.34
@@ -74,6 +74,7 @@
static Ecore_X_Window _e_menu_win = 0;
static Evas_List *_e_active_menus = NULL;
static double _e_menu_activate_time = 0.0;
+static int _e_menu_activate_floating = 0;
static Ecore_Timer *_e_menu_scroll_timer = NULL;
static double _e_menu_scroll_start = 0.0;
static int _e_menu_x = 0;
@@ -150,6 +151,7 @@
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
_e_menu_activate_time = 0.0;
+ _e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
switch (dir)
{
@@ -204,6 +206,7 @@
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
_e_menu_activate_time = ecore_time_get();
+ _e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
switch (dir)
{
@@ -247,6 +250,7 @@
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
_e_menu_activate_time = 0.0;
+ _e_menu_activate_floating = 0;
_e_menu_activate_internal(m, zone);
switch (dir)
{
@@ -2245,7 +2249,10 @@
t = ecore_time_get();
if ((_e_menu_activate_time != 0.0) &&
((t - _e_menu_activate_time) < e_config->menus_click_drag_timeout))
- return 1;
+ {
+ _e_menu_activate_floating = 1;
+ return 1;
+ }
ret = _e_menu_active_call();
if (ret == 1)
@@ -2256,7 +2263,7 @@
}
else if (ret == -1)
_e_menu_deactivate_all();
- else
+ else if (!_e_menu_activate_floating)
_e_menu_deactivate_all();
return 1;
}
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
