Changeset 4570 for branches/1.3

Timestamp:

Jul 22, 2014, 11:48:15 AM (10 years ago)

Author:

gah

Message:

fix sticky global grab

File:

• branches/1.3/gui/scripts/grab.tcl (modified) (3 diffs)

branches/1.3/gui/scripts/grab.tcl

@@ -39 +39 @@
 # ----------------------------------------------------------------------
 rename grab _tk_grab
-proc grab {args} {
+proc grab { args } {
     set op [lindex $args 0]
     if {[winfo exists $op]} {
@@ -54 +54 @@
         set state $::Rappture::grab::state
         set window [lindex $args end]
+
         if {[lsearch -exact $args -global] >= 0} {
             set state "-global"
@@ -91 +92 @@
 
         # and set the next one
-        if {"" != $window} {
-            if {[lindex $window 0] != "-global"} {
-                # no more global grabs -- resume local grabs
-                set ::Rappture::grab::state ""
-            }
+        if {[lindex $window 0] != "-global"} {
+            # no more global grabs -- resume local grabs
+            set ::Rappture::grab::state ""
+        }
+        if { $window != "" } {
             eval _grabset $window
         }