Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_int_menus.c e_intl.c e_ipc.c
Log Message:
Dragging windows between desks work now.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- e_border.c 23 Apr 2005 13:13:45 -0000 1.149
+++ e_border.c 24 Apr 2005 19:56:40 -0000 1.150
@@ -93,6 +93,7 @@
static void _e_border_event_border_unstick_free(void *data, void *ev);
static void _e_border_zone_update(E_Border *bd);
+static void _e_border_desk_update(E_Border *bd);
static void _e_border_resize_begin(E_Border *bd);
static void _e_border_resize_end(E_Border *bd);
@@ -437,6 +438,7 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (!bd->visible) return;
+ if (bd->moving) return;
ecore_x_window_hide(bd->client.win);
e_container_shape_hide(bd->shape);
@@ -487,6 +489,7 @@
bd->client.h);
_e_border_move_update(bd);
_e_border_zone_update(bd);
+ _e_border_desk_update(bd);
ev = calloc(1, sizeof(E_Event_Border_Move));
ev->border = bd;
e_object_ref(E_OBJECT(bd));
@@ -1749,6 +1752,7 @@
bd = data;
bd->moving = 0;
_e_border_move_end(bd);
+ e_zone_flip_coords_handle(bd->zone, -1, -1);
}
static void
@@ -2254,6 +2258,7 @@
{
bd->moving = 0;
_e_border_move_end(bd);
+ e_zone_flip_coords_handle(bd->zone, -1, -1);
}
break;
case E_BINDING_ACTION_RESIZE:
@@ -2329,9 +2334,7 @@
&new_x, &new_y, &new_w, &new_h);
evas_list_free(skiplist);
e_border_move(bd, new_x, new_y);
-#if 0
e_zone_flip_coords_handle(bd->zone, ev->root.x, ev->root.y);
-#endif
}
else if (bd->resize_mode != RESIZE_NONE)
{
@@ -2635,7 +2638,6 @@
if (bd->client.border.changed)
{
Evas_Object *o;
- const char *path;
char buf[4096];
Evas_Coord cx, cy, cw, ch;
int l, r, t, b;
@@ -3858,7 +3860,6 @@
free(e);
}
-
static void
_e_border_zone_update(E_Border *bd)
{
@@ -3886,6 +3887,12 @@
}
static void
+_e_border_desk_update(E_Border *bd)
+{
+ e_border_desk_set(bd, e_desk_current_get(bd->zone));
+}
+
+static void
_e_border_resize_begin(E_Border *bd)
{
Evas_Coord w, h;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_int_menus.c 21 Apr 2005 10:09:26 -0000 1.46
+++ e_int_menus.c 24 Apr 2005 19:56:41 -0000 1.47
@@ -429,7 +429,7 @@
E_Menu_Item *mi;
Evas_List *l, *borders = NULL;
E_Menu *root;
- E_Zone *zone;
+ E_Zone *zone = NULL;
e_menu_pre_activate_callback_set(m, NULL, NULL);
root = e_menu_root_get(m);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_intl.c 22 Apr 2005 03:06:27 -0000 1.21
+++ e_intl.c 24 Apr 2005 19:56:42 -0000 1.22
@@ -67,8 +67,6 @@
void
e_intl_language_set(const char *lang)
{
- char buf[4096];
-
if (_e_intl_language) free(_e_intl_language);
if (!lang) lang = getenv("LANG");
if (lang)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_ipc.c 22 Apr 2005 04:25:51 -0000 1.14
+++ e_ipc.c 24 Apr 2005 19:56:42 -0000 1.15
@@ -308,7 +308,7 @@
case E_IPC_OP_FONT_DEFAULT_SET:
{
char ** argv;
- int i, argc;
+ int argc;
argc = 3;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
