sawfish r4365 - in trunk: . lisp/sawfish/wm/commands lisp/sawfish/wm/state man

[chrisb svn gnome org]

Author: chrisb
Date: Wed Jan 14 18:16:51 2009
New Revision: 4365
URL: http://svn.gnome.org/viewvc/sawfish?rev=4365&view=rev

Log:
slide-window.jl / shading.jl: merged changes from sawfish-pager


Modified:
   trunk/ChangeLog
   trunk/lisp/sawfish/wm/commands/slide-window.jl
   trunk/lisp/sawfish/wm/state/shading.jl
   trunk/man/news.texi

Modified: trunk/lisp/sawfish/wm/commands/slide-window.jl
==============================================================================
--- trunk/lisp/sawfish/wm/commands/slide-window.jl	(original)
+++ trunk/lisp/sawfish/wm/commands/slide-window.jl	Wed Jan 14 18:16:51 2009
@@ -47,7 +47,10 @@
     (call-window-hook 'before-slide-hook w)
     (unless (window-get w 'fixed-position)
       (let ((coords (window-position w)))
-	(move-window-to w (+ (car coords) right) (+ (cdr coords) down)))))
+	(move-window-to w (+ (car coords) right) (+ (cdr coords) down)))
+      (call-window-hook 'after-move-hook w
+			`((,@(if (/= right 0) '(horizontal))
+			   ,@(if (/= down 0) '(vertical)))))))
 
 ;;; window commands
 

Modified: trunk/lisp/sawfish/wm/state/shading.jl
==============================================================================
--- trunk/lisp/sawfish/wm/state/shading.jl	(original)
+++ trunk/lisp/sawfish/wm/state/shading.jl	Wed Jan 14 18:16:51 2009
@@ -49,9 +49,9 @@
     (unless (window-get w 'shaded)
       (window-put w 'shaded t)
       (window-put w 'hide-client t)
+      (reframe-window w)
       (call-window-hook 'shade-window-hook w)
-      (call-window-hook 'window-state-change-hook w (list '(shaded)))
-      (reframe-window w)))
+      (call-window-hook 'window-state-change-hook w (list '(shaded)))))
 
   (define (unshade-window w)
     "If the window is shaded (see `shade-window'), restore it to it's usual
@@ -59,9 +59,9 @@
     (when (window-get w 'shaded)
       (window-put w 'shaded nil)
       (window-put w 'hide-client nil)
+      (reframe-window w)
       (call-window-hook 'unshade-window-hook w)
       (call-window-hook 'window-state-change-hook w (list '(shaded)))
-      (reframe-window w)
       (when raise-windows-when-unshaded
 	(raise-window* w))))
 

Modified: trunk/man/news.texi
==============================================================================
--- trunk/man/news.texi	(original)
+++ trunk/man/news.texi	Wed Jan 14 18:16:51 2009
@@ -73,6 +73,8 @@
 @item Reworked Sawfish-UI [Christopher Bratusek]
 
 @item Dropped libgnome|gnomeui|gnomecanvas widgets, use pure gtk instead [Christopher Bratusek]
+
+ item Merged changes from sawfish-pager [Christopher Bratusek]
 @end itemize
 @end itemize