[sawfish] StyleTab: make Button2-Off for menu-button-work StyleTab: add call-after-state-changed for sticky, f

[Christopher Bratusek <chrisb src gnome org>]

commit d814d41258020941d3401a6b3632f5ab6b4e90ac
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Wed Feb 16 20:32:32 2011 +0100

    StyleTab: make Button2-Off for menu-button-work
    StyleTab: add call-after-state-changed for sticky, fixed-position and stacking properties
    get-S-tabbed: removed old comments
    Elberg-tabbed: likewise

 themes/Elberg-tabbed/theme.jl |    2 --
 themes/StyleTab/theme.jl      |   18 +++++++++++-------
 themes/get-S-tabbed/theme.jl  |    3 ---
 3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/themes/Elberg-tabbed/theme.jl b/themes/Elberg-tabbed/theme.jl
index bee03e3..ced5e7f 100644
--- a/themes/Elberg-tabbed/theme.jl
+++ b/themes/Elberg-tabbed/theme.jl
@@ -491,6 +491,4 @@
     (when (eq (window-get w 'current-frame-style) 'Elberg-tabbed)
       (create-frames)))
 
-;; Create only frames, don't rebuild-frame/reframe-window.
-;; Tabthemes will reframe/rebuild windows call from tabgroup.jl.
 (call-after-state-changed '(title-position) create-frames-only)
diff --git a/themes/StyleTab/theme.jl b/themes/StyleTab/theme.jl
index dd60536..e2195bd 100644
--- a/themes/StyleTab/theme.jl
+++ b/themes/StyleTab/theme.jl
@@ -428,7 +428,7 @@
       (when (or (eq cur 'shaped)
                 (eq cur 'utility))
         (setq new 'default)
-        (setq dim-x (- dim-x (* styletab:borders-dimension 2)))         
+        (setq dim-x (- dim-x (* styletab:borders-dimension 2)))
         (setq dim-y (- dim-y styletab:borders-dimension))
         (when (not (or (eq current-title 'top)
                        (eq current-title 'bottom)))
@@ -452,7 +452,7 @@
                        (eq current-title 'bottom)))
           (setq dim-y (- dim-y (* styletab:borders-dimension 2)))
           (setq dim-x (- dim-x styletab:borders-dimension styletab:title-dimension)))))
-    
+
     (when (eq dest 'sha-tra)
       (if (or (eq cur 'shaped)
               (eq cur 'utility))
@@ -535,7 +535,7 @@
 (def-frame-class frame-type-button ()
   (bind-keys frame-type-button-keymap
              "Button1-Off" 'set-frame-default-and-default/transient-toggle
-             "Button2-Off" 'set-frame-unframed-and-unframed/default-toggle
+             "Button2-Off" 'set-frame-unframed-and-unframed/shaped-transient-toggle
              "Button3-Off" 'set-frame-shaped-and-shaped/shaped-transient-toggle))
 
 (defvar prev-button-keymap
@@ -2089,7 +2089,7 @@
     (current-title-w w)))
 
 (define (reframe-windows style)
-  (map-windows 
+  (map-windows
    (lambda (w)
      (when (eq (window-get w 'current-frame-style) style)
        (current-title-w w)
@@ -2099,6 +2099,12 @@
   (lambda ()
     (reframe-windows theme-name)))
 
+(define (reframe-one w)
+  (when (not (window-get w 'tabbed))
+    (when (eq (window-get w 'current-frame-style) theme-name)
+      (current-title-w w)
+      (rebuild-frame w))))
+
 ;; also reset icon cache
 ;;
 (define clear-cache-reframe
@@ -2113,9 +2119,7 @@
   (setq frame-cache (make-weak-table eq-hash eq))
   (reload-frame-style theme-name))
 
-;; Create only frames, don't rebuild-frame/reframe-window.
-;; Tabthemes will reframe/rebuild windows call from tabgroup.jl. 
-;;
+(call-after-state-changed '(sticky fixed-position stacking) reframe-one)
 (call-after-state-changed '(title-position) create-frames-only)
 
 (custom-set-property 'styletab:title-font ':after-set reframe-all)
diff --git a/themes/get-S-tabbed/theme.jl b/themes/get-S-tabbed/theme.jl
index 4f2c166..bb52b85 100644
--- a/themes/get-S-tabbed/theme.jl
+++ b/themes/get-S-tabbed/theme.jl
@@ -329,7 +329,4 @@
     (when (eq (window-get w 'current-frame-style) 'get-S-tabbed)
       (create-frames)))
 
-;; Create only frames, don't rebuild-frame/reframe-window.
-;; Tabthemes will reframe/rebuild windows call from tabgroup.jl.
-;; 
 (call-after-state-changed '(title-position) create-frames-only)