Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_border.c 


Log Message:
Only be restricitive with actions when using fullscreen maximize.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -3 -r1.377 -r1.378
--- e_border.c  30 Aug 2005 03:18:34 -0000      1.377
+++ e_border.c  30 Aug 2005 03:22:55 -0000      1.378
@@ -619,8 +619,7 @@
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
-   /* FIXME: Some types of maximized might allow this */
-   if ((bd->fullscreen) || (bd->maximized)) return;
+   if ((bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN)) return;
    if (bd->new_client)
      {
        E_Border_Pending_Move_Resize  *pnd;
@@ -667,7 +666,7 @@
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
    /* FIXME: Some types of maximized might allow this */
-   if ((bd->fullscreen) || (bd->maximized)) return;
+   if ((bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN)) return;
    if (bd->new_client)
      {
        E_Border_Pending_Move_Resize  *pnd;
@@ -720,7 +719,7 @@
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
 
    /* FIXME: Some types of maximized might allow this */
-   if ((bd->fullscreen) || (bd->maximized)) return;
+   if ((bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN)) return;
    if (bd->new_client)
      {
        E_Border_Pending_Move_Resize  *pnd;
@@ -2964,8 +2963,8 @@
    bd = e_border_find_by_client_window(e->win);
    if (!bd) return 1;
 
-   if ((bd->shaded) || (bd->shading) || (bd->maximized) ||
-       (bd->moving) || (bd->resize_mode != RESIZE_NONE))
+   if ((bd->shaded) || (bd->shading) || (bd->maximized == 
E_MAXIMIZE_FULLSCREEN) ||
+       (bd->fullscreen) || (bd->moving) || (bd->resize_mode != RESIZE_NONE))
      return 1;
 
    if ((e->button >= 1) && (e->button <= 3))
@@ -6694,7 +6693,7 @@
 
    if (!bd->lock_user_stacking)
      e_border_raise(bd);
-   if ((bd->shaded) || (bd->shading) || (bd->maximized) || (bd->fullscreen) ||
+   if ((bd->shaded) || (bd->shading) || (bd->maximized == 
E_MAXIMIZE_FULLSCREEN) || (bd->fullscreen) ||
        (bd->lock_user_size))
      return 0;
 
@@ -6742,11 +6741,6 @@
 static int
 _e_border_resize_end(E_Border *bd)
 {
-   /* This shouldn't happend, and if, we should be able to end
-   if ((bd->shaded) || (bd->shading) ||
-       (bd->maximized) || (bd->fullscreen))
-     return 0;
-     */
    if (grabbed)
      ecore_x_pointer_ungrab();
    grabbed = 0;
@@ -6800,7 +6794,7 @@
 {
    if (!bd->lock_user_stacking)
      e_border_raise(bd);
-   if ((bd->maximized) || (bd->fullscreen) || (bd->lock_user_location))
+   if ((bd->maximized == E_MAXIMIZE_FULLSCREEN) || (bd->fullscreen) || 
(bd->lock_user_location))
      return 0;
 
    if (grabbed)
@@ -6826,12 +6820,6 @@
 static int
 _e_border_move_end(E_Border *bd)
 {
-   /* This shouldn't happend, and if, we should be able to end
-   if ((bd->shaded) || (bd->shading) ||
-       (bd->maximized) || (bd->fullscreen))
-     return 0;
-   */
-
    if (grabbed)
      ecore_x_pointer_ungrab();
    grabbed = 0;




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to