Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
fix double clikc in click to focus
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -3 -r1.219 -r1.220
--- e_border.c 20 May 2005 10:14:51 -0000 1.219
+++ e_border.c 20 May 2005 17:27:51 -0000 1.220
@@ -440,7 +440,11 @@
if (bd->moving) return;
if (!bd->need_reparent)
- ecore_x_window_hide(bd->client.win);
+ {
+ if (bd->focused)
+ ecore_x_window_focus(bd->zone->container->manager->root);
+ ecore_x_window_hide(bd->client.win);
+ }
e_container_shape_hide(bd->shape);
if (!bd->iconic)
e_hints_window_hidden_set(bd);
@@ -2452,7 +2456,11 @@
}
e_focus_event_mouse_down(bd);
}
- if (ev->win != bd->event_win) return 1;
+ if ((ev->win != bd->event_win) && (ev->event_win != bd->win))
+ {
+ printf("abort ev\n");
+ return 1;
+ }
if ((ev->button >= 1) && (ev->button <= 3))
{
bd->mouse.last_down[ev->button - 1].mx = ev->root.x;
@@ -2464,18 +2472,23 @@
}
bd->mouse.current.mx = ev->root.x;
bd->mouse.current.my = ev->root.y;
+/*
if (bd->moving)
{
+ printf("moving\n");
}
else if (bd->resize_mode != RESIZE_NONE)
{
}
else
+*/
{
Evas_Button_Flags flags = EVAS_BUTTON_NONE;
if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
+ printf("mouse %i %i | DBL %i TRIP %i\n",
+ ev->x, ev->y, ev->double_click, ev->triple_click);
evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, NULL);
evas_event_feed_mouse_down(bd->bg_evas, ev->button, flags, NULL);
}
@@ -2505,7 +2518,6 @@
/* ... VERY unlikely though... VERY */
/* also we dont pass the same params that went in - then again that */
/* should be ok as we are just ending the action if it has an end */
- printf("mouse up after grab!\n");
if (bd->cur_mouse_action)
{
if (bd->cur_mouse_action->func.end_mouse)
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
