Changeset 3286 for branches

Timestamp:

Feb 7, 2013 7:16:30 AM (11 years ago)

Author:

gah

Message:

sync with trunk

File:

• branches/blt4/gui/scripts/sidebarframe.tcl (modified) (3 diffs)

branches/blt4/gui/scripts/sidebarframe.tcl

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  George Howlett, Michael McLennan, Purdue University
-#  Copyright (c) 2004-2009  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -45 +45 @@
     itk_option define -sashcursor sashCursor Cursor ""
 
+    public variable resizeframe 1
     constructor {args} { # defined below }
 
@@ -572 +573 @@
     set x1 [expr {$w - $sbarw - $sashw}]
     set x2 [expr {$w - $sbarw}]
-    place $itk_component(frame) -x 0 -y 0 -anchor nw -width $w -height $h
+    if { $resizeframe } {
+        set framew $x1
+    } else {
+        set framew [expr $w - $ctrlw - $sashw]
+    }
+    place $itk_component(frame) -x 0 -y 0 -anchor nw -width $framew -height $h
     place $itk_component(sashbg) -x $x1 -y 0 -anchor nw -width $sashw -height $h
-    place $itk_component(sidebar) -x $x2 -y 0 -anchor nw -width $sbarw -height $h
+    place $itk_component(sidebar) -x $x2 -y 0 -anchor nw \
+        -width $sbarw -height $h
 }