Changeset 1929 for trunk/gui/scripts/dropdown.tcl

Timestamp:

Oct 22, 2010, 4:06:10 PM (14 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/dropdown.tcl (modified) (6 diffs)

trunk/gui/scripts/dropdown.tcl

@@ -37 +37 @@
 
     bind RapptureDropdown <ButtonPress> \
-        {if {[Rappture::Dropdown::outside %W %X %Y]} {%W unpost}}
+        {if {[Rappture::Dropdown::outside %W %X %Y]} {%W unpost}}
 }
 
@@ -75 +75 @@
 
     if {[string length $itk_option(-postcommand)] > 0} {
-        set cmd [list uplevel #0 $itk_option(-postcommand)]
-        if {[catch $cmd result]} {
-            bgerror $result
-        }
+        set cmd [list uplevel #0 $itk_option(-postcommand)]
+        if {[catch $cmd result]} {
+            bgerror $result
+        }
     }
 
@@ -87 +87 @@
 
     if {[regexp {^@([0-9]+),([0-9]+)$} $where match x y]} {
-        set xpos $x
-        set ypos $y
+        set xpos $x
+        set ypos $y
     } elseif {[winfo exists $where]} {
-        set x0 [winfo rootx $where]
-        switch -- $args {
-            left { set xpos $x0 }
-            right { set xpos [expr {$x0 + [winfo width $where] - $sw}] }
-            default {
-                error "bad option \"$args\": should be left, right"
-            }
-        }
-        set ypos [expr {[winfo rooty $where]+[winfo height $where]}]
+        set x0 [winfo rootx $where]
+        switch -- $args {
+            left { set xpos $x0 }
+            right { set xpos [expr {$x0 + [winfo width $where] - $sw}] }
+            default {
+                error "bad option \"$args\": should be left, right"
+            }
+        }
+        set ypos [expr {[winfo rooty $where]+[winfo height $where]}]
     } else {
-        error "bad position \"$where\": should be widget name or @x,y"
+        error "bad position \"$where\": should be widget name or @x,y"
     }
 
     # make sure the dropdown doesn't go off screen
     if {$xpos > 0} {
-        # left-justified positions
-        if {$xpos + $w > $sw} {
-            set xpos [expr {$sw-$w}]
-            if {$xpos < 0} { set xpos 0 }
-        }
-        set xpos "+$xpos"
+        # left-justified positions
+        if {$xpos + $w > $sw} {
+            set xpos [expr {$sw-$w}]
+            if {$xpos < 0} { set xpos 0 }
+        }
+        set xpos "+$xpos"
     } else {
-        # right-justified positions
-        if {$xpos - $w < -$sw} {
-            set xpos [expr {-$sw+$w}]
-            if {$xpos > 0} { set xpos -1 }
-        }
+        # right-justified positions
+        if {$xpos - $w < -$sw} {
+            set xpos [expr {-$sw+$w}]
+            if {$xpos > 0} { set xpos -1 }
+        }
     }
     if {$ypos + $h > $sh} {
-        set ypos [expr {$sh-$h}]
-        if {$ypos < 0} { set ypos 0 }
+        set ypos [expr {$sh-$h}]
+        if {$ypos < 0} { set ypos 0 }
     }
 
@@ -133 +133 @@
     update
     while {[catch {grab set -global $itk_component(hull)}]} {
-        after 100
+        after 100
     }
 }
@@ -147 +147 @@
 
     if {[string length $itk_option(-unpostcommand)] > 0} {
-        set cmd [list uplevel #0 $itk_option(-unpostcommand)]
-        if {[catch $cmd result]} {
-            bgerror $result
-        }
+        set cmd [list uplevel #0 $itk_option(-unpostcommand)]
+        if {[catch $cmd result]} {
+            bgerror $result
+        }
     }
 }
@@ -172 +172 @@
 itcl::body Rappture::Dropdown::outside {widget x y} {
     return [expr {$x < [winfo rootx $widget]
-             || $x > [winfo rootx $widget]+[winfo width $widget]
-             || $y < [winfo rooty $widget]
-             || $y > [winfo rooty $widget]+[winfo height $widget]}]
+             || $x > [winfo rootx $widget]+[winfo width $widget]
+             || $y < [winfo rooty $widget]
+             || $y > [winfo rooty $widget]+[winfo height $widget]}]
 }