Changeset 26 for trunk/gui/scripts/pager.tcl

Timestamp:

Jul 19, 2005, 1:15:04 AM (19 years ago)

Author:

mmc

Message:

Fixed the rendering of groups, and groups within groups.
If groups are mixed in with other elements, then they are
drawn with a gray outline/heading, with the title taken
from the <group><about><label>. However, if a group
contains only other groups, then it is treated as a tabbed
notebook, and each group within is put on a separate page.

WARNING: There are many bad interactions between the
blt::tabset, the Rappture::Scroller, and the Rappture::Pager.
Pages shake violently when all are in play. The only way I
could get them to settle down was by putting the tabs above
the pages they control. Have to revisit this some time to
make it look better...

File:

• trunk/gui/scripts/pager.tcl (modified) (8 diffs)

trunk/gui/scripts/pager.tcl

@@ -401 +401 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Pager::_fixSize {} {
+    set sw [expr {[winfo screenwidth $itk_component(hull)]-200}]
+    set sh [expr {[winfo screenheight $itk_component(hull)]-200}]
+
     switch -- $itk_option(-arrangement) {
         pages {
             if {$itk_option(-width) <= 0} {
-                update idletasks
                 set maxw [expr {
                     [winfo reqwidth $itk_component(next)]
@@ -415 +417 @@
                 }
                 set maxw [expr {$maxw + 2*$itk_option(-padding)}]
+                if {$maxw > $sw} { set maxw $sw }
                 $itk_component(inside) configure -width $maxw
             } else {
@@ -421 +424 @@
 
             if {$itk_option(-height) <= 0} {
-                update idletasks
                 set maxh 0
                 foreach name $_pages {
@@ -428 +430 @@
                 }
                 set maxh [expr {$maxh + 2*$itk_option(-padding)}]
+                if {$maxh > $sh} { set maxh $sh }
                 $itk_component(inside) configure -height $maxh
             } else {
@@ -435 +438 @@
         side-by-side {
             if {$itk_option(-width) <= 0} {
-                update idletasks
                 set maxw [expr {
                     [winfo reqwidth $itk_component(next)]
@@ -447 +449 @@
                 }
                 if {$wtotal > $maxw} { set maxw $wtotal }
+                if {$maxw > $sw} { set maxw $sw }
                 $itk_component(inside) configure -width $maxw
             } else {
@@ -453 +456 @@
 
             if {$itk_option(-height) <= 0} {
-                update idletasks
                 set maxh 0
                 foreach name $_pages {
@@ -460 +462 @@
                 }
                 set maxh [expr {$maxh + 2*$itk_option(-padding)}]
+                if {$maxh > $sh} { set maxh $sh }
                 $itk_component(inside) configure -height $maxh
             } else {