E CVS: e kwo

[enlightenment-cvs]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ewin-ops.c 


Log Message:
Fix stick/unstick updates.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ewin-ops.c  8 May 2005 20:26:49 -0000       1.32
+++ ewin-ops.c  10 May 2005 21:29:08 -0000      1.33
@@ -417,10 +417,7 @@
 #endif
 
    if (reparent)
-     {
-       EoReparent(ewin, desk, x, y);
-       HintsSetWindowDesktop(ewin);
-     }
+      EoReparent(ewin, desk, x, y);
    else
       EoMoveResize(ewin, x, y, w, h);
 
@@ -477,7 +474,9 @@
 
    if (Mode.mode == MODE_NONE && desk != pdesk)
      {
+       HintsSetWindowDesktop(ewin);
        SnapshotEwinUpdate(ewin, SNAP_USE_DESK);
+
        if (call_depth == 1)
          {
             if (EoIsShown(ewin))
@@ -710,6 +709,8 @@
    MoveEwinToDesktopAt(ewin, DesksGetCurrent(), EoGetX(ewin), EoGetY(ewin));
    EwinBorderUpdateState(ewin);
    HintsSetWindowState(ewin);
+   HintsSetWindowDesktop(ewin);
+   SnapshotEwinUpdate(ewin, SNAP_USE_STICKY);
 }
 
 void
@@ -732,10 +733,12 @@
       y += VRoot.h;
    y -= dy;
 
-   MoveEwinToDesktopAt(ewin, DesksGetCurrent(), x, y);
    EoSetSticky(ewin, 1);
+   MoveEwinToDesktopAt(ewin, DesksGetCurrent(), x, y);
    EwinBorderUpdateState(ewin);
    HintsSetWindowState(ewin);
+   HintsSetWindowDesktop(ewin);
+   SnapshotEwinUpdate(ewin, SNAP_USE_STICKY);
 }
 
 void
@@ -1581,7 +1584,6 @@
             SoundPlay("SOUND_WINDOW_STICK");
             EwinStick(gwins[i]);
          }
-       SnapshotEwinUpdate(gwins[i], SNAP_USE_STICKY);
      }
    if (gwins)
       Efree(gwins);
@@ -1784,9 +1786,12 @@
 void
 EwinOpMoveToDesk(EWin * ewin, int desk)
 {
+   EoSetSticky(ewin, 0);
    MoveEwinToDesktop(ewin, desk);
    RaiseEwin(ewin);
-   EoSetSticky(ewin, 0);
+   EwinBorderUpdateState(ewin);
+   HintsSetWindowState(ewin);
+   HintsSetWindowDesktop(ewin);
    SnapshotEwinUpdate(ewin, SNAP_USE_STICKY);
 }
 




-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs