hg/stx-libwidg: comparison HorizontalPanelView.st

equal deleted inserted replaced

-:53cbfeaa9c9a
+:3ee5ea99d0e2
 HorizontalPanelView comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libwidg/HorizontalPanelView.st,v 1.8 1995-02-06 00:52:25 claus Exp $
+$Header: /cvs/stx/stx/libwidg/HorizontalPanelView.st,v 1.9 1995-05-03 00:29:39 claus Exp $
 '!
 !HorizontalPanelView class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/HorizontalPanelView.st,v 1.8 1995-02-06 00:52:25 claus Exp $
+$Header: /cvs/stx/stx/libwidg/HorizontalPanelView.st,v 1.9 1995-05-03 00:29:39 claus Exp $
 "
 !
 documentation
 "
 The horizontal layout can be any of:
 	#left           arrange elements at the left
 	#leftSpace      arrange elements at the left, start with spacing
+	#fixLeft        same as #left, but do not reduce spacing in case of no fit
+	#fixLeftSpace   same as #leftSpace, but do not reduce spacing in case of no fit
 	#right          arrange elements at the right
 	#rightSpace     arrange elements at the right, start with spacing
 	#center         arrange elements in the center
 	#spread         spread elements evenly
 	#spreadSpace    spread elements evenly with spacing at the ends
 The defaults is #center for both directions.
 The layout is changed by the messages #verticalLayout: and #horizontalLayout:.
 For backward compatibility (to times, where only hLayout existed), the simple
 #layout: does the same as #horizontalLayout:. Do not use this old method.
-If none of these layout/space combinations is exactly what you need in
+By combining Horizontal- and VerticalPanels (i.e. place a hPanel into a
-your application, create a subclass, and redefine the setChildPositions method.
+vPanel), most layouts should be implementable.
+However, ff none of these layout/space combinations is exactly what you need
+in your application, create a subclass, and redefine the setChildPositions
+method there.
 "
 !
 examples
 "
 verticalLayout settings. Try them all. Especially, notice the
 differences between the xxx and xxxSpace layouts and the effect of
 setting different values for the spacing.
 Try resizing the view and see how the elements get rearranged.
-All of the below examples place 3 buttons onto a panel - of course,
+Most of the examples below place 3 buttons onto a panel; Of course,
-you can put any other view into a panel ... the last example shows this.
+you can put any other view into a panel ... the last examples show this.
 example: default layout (centered)
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
-	v label:'default'.
+	v label:'default: center'.
 	p := HorizontalPanelView in:v.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=left'.
+	v label:'hL=left; vL=default (center)'.
 	p horizontalLayout:#left.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=leftSpace'.
+	v label:'hL=leftSpace; vL=center'.
 	p horizontalLayout:#leftSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=leftFit'.
+	v label:'hL=leftFit; vL=center'.
 	p horizontalLayout:#leftFit.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=leftFit'.
+	v label:'hL=leftSpaceFit; vL=center'.
 	p horizontalLayout:#leftSpaceFit.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=right'.
+	v label:'hL=right; vL=center'.
 	p horizontalLayout:#right.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=rightSpace'.
+	v label:'hL=rightSpace; vL=center'.
 	p horizontalLayout:#rightSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
 	p horizontalLayout:#fit.
-	v label:'hL=fit'.
+	v label:'hL=fit; vL=center'.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	b3 := Button label:'button3' in:p.
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
 	p horizontalLayout:#fit.
 	p horizontalSpace:0.
-	v label:'hL=fit hS=0'.
+	v label:'hL=fit hS=0; vL=center'.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	b3 := Button label:'button3' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fitSpace'.
+	v label:'hL=fitSpace; vL=center'.
 	p horizontalLayout:#fitSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
 	p horizontalLayout:#spread.
-	v label:'hL=spread'.
+	v label:'hL=spread; vL=center'.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	b3 := Button label:'button3' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=spreadSpace'.
+	v label:'hL=spreadSpace; vL=center'.
 	p horizontalLayout:#spreadSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=spreadSpace vL=fit'.
+	v label:'hL=spreadSpace; vL=fit'.
 	p horizontalLayout:#spreadSpace.
 	p verticalLayout:#fit.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=spreadSpace vL=fitSpace'.
+	v label:'hL=spreadSpace; vL=fitSpace'.
 	p horizontalLayout:#spreadSpace.
 	p verticalLayout:#fitSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fit vL=top'.
+	v label:'hL=fit; vL=top'.
 	p horizontalLayout:#fit.
 	p verticalLayout:#top.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fitSpace vL=top'.
+	v label:'hL=fitSpace; vL=top'.
 	p horizontalLayout:#fitSpace.
 	p verticalLayout:#top.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fitSpace vL=fitSpace'.
+	v label:'hL=fitSpace; vL=fitSpace'.
 	p horizontalLayout:#fitSpace.
 	p verticalLayout:#fitSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fit vL=fit hS=0'.
+	v label:'hL=fit hS=0; vL=fit'.
 	p horizontalLayout:#fit.
 	p verticalLayout:#fit.
 	p horizontalSpace:0.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fitSpace vL=topSpace'.
+	v label:'hL=fitSpace; vL=topSpace'.
 	p horizontalLayout:#fitSpace.
 	p verticalLayout:#topSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fit vL=top'.
+	v label:'hL=fit; vL=top'.
 	p horizontalLayout:#fit.
 	p verticalLayout:#top.
 	p horizontalSpace:0.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fitSpace vL=bottomSpace'.
+	v label:'hL=fitSpace; vL=bottomSpace'.
 	p horizontalLayout:#fitSpace.
 	p verticalLayout:#bottomSpace.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	|v p b1 b2 b3|
 	v := StandardSystemView new.
 	p := HorizontalPanelView in:v.
-	v label:'hL=fit vL=bottomSpace'.
+	v label:'hL=fit; vL=bottomSpace'.
 	p horizontalLayout:#fit.
 	p verticalLayout:#bottomSpace.
 	p horizontalSpace:0.
 	p origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
 	b1 := Button label:'button1' in:p.
 	b2 := Button label:'button2' in:p.
 	b3 := Button label:'button3' in:p.
 	v extent:300 @ 100.
+	v open
+example: placing hPanels into a vPanel
+	|v vP hP1 hP2 hP3 b1 b2 b3 b4 b5 b6 b7 b8 b9|
+	v := StandardSystemView new.
+	vP := VerticalPanelView in:v.
+	vP origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
+	vP verticalLayout:#fit;
+	   verticalSpace:0;
+	   horizontalLayout:#fit.
+	hP1 := HorizontalPanelView in:vP.
+	hP1 horizontalLayout:#fitSpace;
+	    verticalLayout:#center.
+	b1 := Button label:'button1' in:hP1.
+	b2 := Button label:'button2' in:hP1.
+	b3 := Button label:'button3' in:hP1.
+	hP2 := HorizontalPanelView in:vP.
+	hP2 horizontalLayout:#fitSpace;
+	    verticalLayout:#center.
+	b4 := Button label:'button4' in:hP2.
+	b5 := Button label:'button5' in:hP2.
+	b6 := Button label:'button6' in:hP2.
+	hP3 := HorizontalPanelView in:vP.
+	hP3 horizontalLayout:#fitSpace;
+	    verticalLayout:#center.
+	b7 := Button label:'button7' in:hP3.
+	b8 := Button label:'button8' in:hP3.
+	b9 := Button label:'button9' in:hP3.
+	v extent:300 @ 300.
 	v open
 example: a browser like table, where the rightmost list
 	     extends to the far right.
 	l2 ignoreParentDirectory:true.
 	l2 action:[:selection | l3 directory:(l2 selectedPathname)].
 	l3 := ScrollableView for:FileSelectionList in:p.
 	l3 directory:nil.
-	l3 ignoreParentDirectory:true.
+	l3 ignoreParentDirectory:false.
 	v extent:400 @ 300.
 	v open
 "
 ! !
 horizontalLayout
 "return the horizontal layout as symbol.
 the returned value is one of
 	#left
 	#leftSpace
+	#leftFit
+	#leftSpaceFit
 	#center
 	#spread
 	#fit
 	#right
 	#rightSpace
 the default is #center
+See the class documentation for  the meanings.
 "
 ^ hLayout
 !
 	#top / #topSpace
 	#center
 	#bottom / #bottomSpace
 	#fit
 the default is #center
+See the class documentation for  the meanings.
 "
 ^ vLayout
 !
 horizontalLayout:aSymbol
 "change the horizontal layout as symbol.
 The argument, aSymbol must be one of:
 	#left / #leftSpace
+	#leftFit / #leftSpaceFit
 	#center
-	#spread / spredSpace
+	#spread / spreadSpace
 	#fit / fitSpace
 	#right / #rightSpace
-the default (if never changed) is #center
+the default (if never changed) is #center.
+See the class documentation for  the meanings.
 "
 (hLayout ~~ aSymbol) ifTrue:[
 	hLayout := aSymbol.
 	self layoutChanged
 	#top / #topSpace
 	#center
 	#bottom / #bottomSpace
 	#fit
 the default (if never changed) is #center
+See the class documentation for  the meanings.
 "
 (vLayout ~~ aSymbol) ifTrue:[
 	vLayout := aSymbol.
 	self layoutChanged
 setChildPositions
 "(re)compute position of every child whenever childs are added or
 my size has changed"
-|xpos space sumOfWidths numChilds l wEach wInside|
+|xpos space sumOfWidths numChilds l wEach wInside hL vL|
 subViews isNil ifTrue:[^ self].
 space := horizontalSpace.
 numChilds := subViews size.
 wInside := width - (margin * 2) + (borderWidth*2) - subViews last borderWidth.
-hLayout == #fitSpace ifTrue:[
+hL := hLayout.
+vL := vLayout.
+hL == #fitSpace ifTrue:[
 	"
 	 adjust childs extents and set origins.
 	 Be careful to avoid accumulation of rounding errors
 	"
 	wEach := (wInside - (numChilds + 1 * space)) / numChilds.
 	xpos := space + margin - borderWidth.
 ] ifFalse:[
-	hLayout == #fit ifTrue:[
+	hL == #fit ifTrue:[
 	    "
 	     adjust childs extents and set origins.
 	     Be careful to avoid accumulation of rounding errors
 	    "
 	    wEach := (wInside - (numChilds - 1 * space)) / numChilds.
 	    "
 	     compute net width needed
 	    "
 	    sumOfWidths := subViews inject:0 into:[:sumSoFar :child | sumSoFar + child widthIncludingBorder].
-	    l := hLayout.
+	    l := hL.
 	    ((l == #center) and:[numChilds == 1]) ifTrue:[
 		l := #spread
 	    ].
 	    (l == #spread and:[numChilds == 1]) ifTrue:[
 		l := #spreadSpace
 	    "
 	     compute position of leftmost subview and space between them;
 	     if they do hardly fit, leave no space between them
 	    "
-	    (sumOfWidths >= (width - (margin * 2))) ifTrue:[
+	    ((sumOfWidths >= (width - (margin * 2)))
+	    and:[l ~~ #fixLeftSpace and:[l ~~ #fixLeft]]) ifTrue:[
 		xpos := 0.
 		space := 0
 	    ] ifFalse: [
+		l == #fixLeftSpace ifTrue:[
+		    l := #leftSpace
+		] ifFalse:[
+		    l == #fixLeft ifTrue:[
+			l := #left
+		    ]
+		].
 		((l == #right) or:[l == #rightSpace]) ifTrue:[
 		    xpos := width - (space * (numChilds - 1)) - sumOfWidths.
 	"
 		    borderWidth == 0 ifTrue:[
 			xpos := xpos + space
 			((l == #left)
 			or:[l == #leftSpace
 			or:[l == #leftFit
 			or:[l == #leftSpaceFit]]]) ifTrue:[
 			    space := space min:(width - sumOfWidths) // (numChilds + 1).
+			    (hL == #fixLeft or:[hL == #fixLeftSpace]) ifTrue:[
+				space := space max:horizontalSpace.
+			    ] ifFalse:[
+				space := space max:0.
+			    ].
 			    (l == #leftSpace
 			    or:[l == #leftSpaceFit]) ifTrue:[
 				xpos := space.
 			    ] ifFalse:[
 				xpos := 0
 "now set positions"
 subViews keysAndValuesDo:[:index :child |
 	|ypos advance|
-	vLayout == #top ifTrue:[
+	vL == #top ifTrue:[
 	    ypos := 0
 	] ifFalse:[
-	    vLayout == #topSpace ifTrue:[
+	    vL == #topSpace ifTrue:[
 		ypos := verticalSpace
 	    ] ifFalse:[
-		vLayout == #bottom ifTrue:[
+		vL == #bottom ifTrue:[
 		    ypos := height - child heightIncludingBorder
 		] ifFalse:[
-		    vLayout == #bottomSpace ifTrue:[
+		    vL == #bottomSpace ifTrue:[
 			ypos := height - verticalSpace - child heightIncludingBorder.
 		    ] ifFalse:[
-			vLayout == #fitSpace ifTrue:[
+			vL == #fitSpace ifTrue:[
 			    ypos := verticalSpace.
 			    child height:(height - (verticalSpace + child borderWidth * 2))
 			] ifFalse:[
-			    vLayout == #fit ifTrue:[
+			    vL == #fit ifTrue:[
 				ypos := 0.
 				child height:(height - (child borderWidth * 2))
 			    ] ifFalse:[
 				"centered"
 				ypos := (height - child heightIncludingBorder) // 2.
 		]
 	    ]
 	].
 	(ypos < 0) ifTrue:[ypos := 0].
-	(hLayout == #fit or:[hLayout == #fitSpace]) ifTrue:[
+	(hL == #fit or:[hL == #fitSpace]) ifTrue:[
 	    child origin:(xpos truncated @ ypos)
 		  corner:(xpos + wEach - (child borderWidth)) truncated
 			 @ (ypos + child height).
 	    advance := wEach.
 	] ifFalse:[
 	xpos := xpos + advance + space.
 	index == numChilds ifTrue:[
 	    |x|
-	    hLayout == #leftFit ifTrue:[
+	    hL == #leftFit ifTrue:[
 		x := width - margin.
 	    ].
-	    hLayout == #leftSpaceFit ifTrue:[
+	    hL == #leftSpaceFit ifTrue:[
 		x := width - margin - space
 	    ].
 	    x notNil ifTrue:[
 		subViews last corner:(x @ (ypos + child height))
 	    ]

changeset 118	3ee5ea99d0e2
parent 77	565b052f5277
child 125	3ffa271732f7