Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_desk.c
Log Message:
2 more bugs gone
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -3 -r1.281 -r1.282
--- e_border.c 24 Jun 2005 03:12:05 -0000 1.281
+++ e_border.c 24 Jun 2005 04:10:18 -0000 1.282
@@ -556,7 +556,12 @@
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (!bd->visible) return;
if (bd->moving) return;
-
+ if (bd->resize_mode != RESIZE_NONE)
+ {
+ bd->resize_mode = RESIZE_NONE;
+ _e_border_resize_end(bd);
+ }
+
if (!bd->need_reparent)
{
if (bd->focused)
@@ -1543,16 +1548,6 @@
}
void
-e_border_ping(E_Border *bd)
-{
- bd->ping_ok = 0;
- ecore_x_netwm_ping_send(bd->client.win);
- bd->ping = ecore_time_get();
- if (bd->ping_timer) ecore_timer_del(bd->ping_timer);
- bd->ping_timer = ecore_timer_add(10.0, _e_border_cb_ping_timer, bd);
-}
-
-void
e_border_act_move_begin(E_Border *bd, Ecore_X_Event_Mouse_Button_Down *ev)
{
if (!bd->moving)
@@ -1813,6 +1808,36 @@
return list;
}
+void
+e_border_ping(E_Border *bd)
+{
+ bd->ping_ok = 0;
+ ecore_x_netwm_ping_send(bd->client.win);
+ bd->ping = ecore_time_get();
+ if (bd->ping_timer) ecore_timer_del(bd->ping_timer);
+ bd->ping_timer = ecore_timer_add(10.0, _e_border_cb_ping_timer, bd);
+}
+
+void
+e_border_move_cancel(void)
+{
+ if (move)
+ {
+ move->moving = 0;
+ _e_border_move_end(move);
+ }
+}
+
+void
+e_border_resize_cancel(void)
+{
+ if (resize)
+ {
+ resize->resize_mode = RESIZE_NONE;
+ _e_border_resize_end(resize);
+ }
+}
+
/* local subsystem functions */
static void
_e_border_free(E_Border *bd)
@@ -5152,7 +5177,6 @@
(bd->maximized) || (bd->fullscreen))
return 0;
-
if ((bd->client.icccm.base_w >= 0) &&
(bd->client.icccm.base_h >= 0))
{
@@ -5186,7 +5210,6 @@
(bd->maximized) || (bd->fullscreen))
return 0;
*/
-
if (grabbed)
ecore_x_pointer_ungrab();
grabbed = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_border.h 22 Jun 2005 06:28:46 -0000 1.82
+++ e_border.h 24 Jun 2005 04:10:18 -0000 1.83
@@ -470,7 +470,9 @@
EAPI Evas_List *e_border_lost_windows_get(E_Zone *zone);
EAPI void e_border_ping(E_Border *bd);
-
+EAPI void e_border_move_cancel(void);
+EAPI void e_border_resize_cancel(void);
+
extern EAPI int E_EVENT_BORDER_RESIZE;
extern EAPI int E_EVENT_BORDER_MOVE;
extern EAPI int E_EVENT_BORDER_ADD;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_desk.c 19 Jun 2005 19:00:04 -0000 1.35
+++ e_desk.c 24 Jun 2005 04:10:18 -0000 1.36
@@ -87,7 +87,12 @@
if ((bd->desk == desk) || (bd->sticky))
e_border_show(bd);
else
- e_border_hide(bd, 1);
+ {
+ if (bd->moving)
+ e_border_desk_set(bd, desk);
+ else
+ e_border_hide(bd, 1);
+ }
}
}
e_container_border_list_free(bl);
-------------------------------------------------------
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
