Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_actions.c e_border.c e_winlist.c 


Log Message:


fix shade unshade mumbo

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_actions.c 12 Jun 2005 06:50:33 -0000      1.12
+++ e_actions.c 14 Jun 2005 10:52:05 -0000      1.13
@@ -536,19 +536,19 @@
          {
             if (!strcmp(params, "next"))
               {
-                 e_winlist_show(zone);
-                 e_winlist_next();
+                 if (!e_winlist_show(zone))
+                   e_winlist_next();
               }
             else if (!strcmp(params, "prev"))
               {
-                 e_winlist_show(zone);
-                 e_winlist_prev();
+                 if (!e_winlist_show(zone))
+                   e_winlist_prev();
               }
          }
        else
          {
-            e_winlist_show(zone);
-            e_winlist_next();
+            if (!e_winlist_show(zone))
+              e_winlist_next();
          }
      }
 }
@@ -569,20 +569,23 @@
               {
                  if (e_winlist_show(zone))
                    e_winlist_modifiers_set(ev->modifiers);
-                 e_winlist_next();
+                 else
+                   e_winlist_next();
               }
             else if (!strcmp(params, "prev"))
               {
                  if (e_winlist_show(zone))
                    e_winlist_modifiers_set(ev->modifiers);
-                 e_winlist_prev();
+                 else
+                   e_winlist_prev();
               }
          }
        else
          {
             if (e_winlist_show(zone))
               e_winlist_modifiers_set(ev->modifiers);
-            e_winlist_next();
+            else
+              e_winlist_next();
          }
      }
 }
@@ -603,20 +606,23 @@
               {
                  if (e_winlist_show(zone))
                    e_winlist_modifiers_set(ev->modifiers);
-                 e_winlist_next();
+                 else
+                   e_winlist_next();
               }
             else if (!strcmp(params, "prev"))
               {
                  if (e_winlist_show(zone))
                    e_winlist_modifiers_set(ev->modifiers);
-                 e_winlist_prev();
+                 else
+                   e_winlist_prev();
               }
          }
        else
          {
             if (e_winlist_show(zone))
               e_winlist_modifiers_set(ev->modifiers);
-            e_winlist_next();
+            else
+              e_winlist_next();
          }
      }
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -3 -r1.255 -r1.256
--- e_border.c  12 Jun 2005 06:50:33 -0000      1.255
+++ e_border.c  14 Jun 2005 10:52:05 -0000      1.256
@@ -4271,8 +4271,8 @@
    bd->changed = 1;
 
    /* we're done */
-   if ( (bd->shaded && (bd->shade.val == 1)) ||
-        (!(bd->shaded) && (bd->shade.val == 0)) )
+   if ((bd->shaded && (bd->shade.val == 1)) ||
+       (!(bd->shaded) && (bd->shade.val == 0)) )
      {
        E_Event_Border_Resize *ev;
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_winlist.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_winlist.c 14 Jun 2005 10:19:25 -0000      1.14
+++ e_winlist.c 14 Jun 2005 10:52:05 -0000      1.15
@@ -134,7 +134,7 @@
    
    bd = e_border_focused_get();
    if (bd) e_border_focus_set(bd, 0, 0);
-   _e_winlist_activate_nth(0);
+   _e_winlist_activate_nth(1);
    evas_event_thaw(winlist->evas);
    _e_winlist_size_adjust();
 
@@ -459,7 +459,10 @@
        if (ww->border->desk) e_desk_show(ww->border->desk);
        ok = 1;
      }
-   if ((ww->border->shaded) &&
+   if (((ww->border->shaded) ||
+       ((ww->border->changes.shaded) &&
+        (ww->border->shade.val != ww->border->shaded) &&
+        (ww->border->shade.val))) &&
        (ww->border->desk == e_desk_current_get(winlist->zone)) &&
        (e_config->winlist_list_uncover_while_selecting))
      {




-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games.  How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.  
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to