Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_bindings.c e_actions.c
Log Message:
Not allow resize when shaded.
Only show resize handles if resize is allowed.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -3 -r1.446 -r1.447
--- e_border.c 10 Oct 2005 22:08:51 -0000 1.446
+++ e_border.c 11 Oct 2005 20:21:50 -0000 1.447
@@ -671,7 +671,9 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
- if ((bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN)) return;
+ if ((bd->shaded) || (bd->shading) || (bd->fullscreen) ||
+ (bd->maximized == E_MAXIMIZE_FULLSCREEN))
+ return;
if (bd->new_client)
{
E_Border_Pending_Move_Resize *pnd;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_bindings.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_bindings.c 11 Oct 2005 05:51:03 -0000 1.25
+++ e_bindings.c 11 Oct 2005 20:21:50 -0000 1.26
@@ -59,9 +59,9 @@
char params[32];
snprintf(params, sizeof(params), "resize_%s", eb->params);
e_bindings_signal_add(eb->context, "mouse,in", eb->source,
eb->modifiers,
- eb->any_mod, "pointer_push", params);
+ eb->any_mod, "pointer_resize_push", params);
e_bindings_signal_add(eb->context, "mouse,out", eb->source,
eb->modifiers,
- eb->any_mod, "pointer_pop", params);
+ eb->any_mod, "pointer_resize_pop", params);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_actions.c 9 Oct 2005 18:02:17 -0000 1.39
+++ e_actions.c 11 Oct 2005 20:21:50 -0000 1.40
@@ -1213,7 +1213,7 @@
ecore_main_loop_quit();
}
-ACT_FN_GO(pointer_push)
+ACT_FN_GO(pointer_resize_push)
{
E_Manager *man = NULL;
@@ -1222,6 +1222,9 @@
{
E_Border *bd;
bd = (E_Border *)obj;
+ if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
+ (bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN))
+ return;
if (bd->zone)
man = bd->zone->container->manager;
}
@@ -1230,7 +1233,7 @@
e_pointer_type_push(man->pointer, obj, params);
}
-ACT_FN_GO(pointer_pop)
+ACT_FN_GO(pointer_resize_pop)
{
E_Manager *man = NULL;
@@ -1239,6 +1242,9 @@
{
E_Border *bd;
bd = (E_Border *)obj;
+ if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
+ (bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN))
+ return;
if (bd->zone)
man = (E_Manager *)bd->zone->container->manager;
}
@@ -1337,8 +1343,8 @@
ACT_GO(restart);
ACT_GO(exit);
- ACT_GO(pointer_push);
- ACT_GO(pointer_pop);
+ ACT_GO(pointer_resize_push);
+ ACT_GO(pointer_resize_pop);
return 1;
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
