hg/stx-libwidg: comparison VariableVerticalPanel.st

equal deleted inserted replaced

-:1122ab450f80
+:6d917a89f7b7
 VariableVerticalPanel comment:'
 COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libwidg/VariableVerticalPanel.st,v 1.11 1994-11-28 21:05:40 claus Exp $
+$Header: /cvs/stx/stx/libwidg/VariableVerticalPanel.st,v 1.12 1995-02-06 00:54:57 claus Exp $
 '!
 !VariableVerticalPanel class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/VariableVerticalPanel.st,v 1.11 1994-11-28 21:05:40 claus Exp $
+$Header: /cvs/stx/stx/libwidg/VariableVerticalPanel.st,v 1.12 1995-02-06 00:54:57 claus Exp $
 "
 !
 documentation
 "
 	p := VariableVerticalPanel
 		 origin:0.0 @ 0.0
 		 corner:1.0 @ 1.0
 		 in:top.
 	v1 := ScrollableView for:SelectionInListView in:p.
-	v1 origin:0.0 @ 0.0
+	v1 origin:0.0 @ 0.0 corner:1.0 @ 0.5.
-	   corner:1.0 @ 0.5.
 	v1 list:(FileDirectory directoryNamed:'/etc') contents.
 	v1 action:[:selNr |
 		|fullName stream text|
 		fullName := '/etc/' , v1 selectionValue.
 		stream := fullName asFilename readStream.
 		    v3 contents:text
 		]
 	].
 	v2 := TextView
-		 origin:0.0 @ 0.5
+		 origin:0.0 @ 0.5 corner:1.0 @ 0.8 in:p.
-		 corner:1.0 @ 0.8
+	v3 := ScrollableView
+		 for:TextView
 		 in:p.
-	v3 := ScrollableView
+	v3 origin:0.0 @ 0.8 corner:1.0 @ 1.0.
-		 for:EditTextView
-		 in:p.
-	v3 origin:0.0 @ 0.8
-	   corner:1.0 @ 1.0.
 	top open
 "
 ! !
 !VariableVerticalPanel class methodsFor:'defaults'!
 !
 style:styleSymbol
 "define the style of the handle;
 styleSymbol may be #motif to draw a little knob or
-enything else to draw scrollBars handleForm"
+anything else to draw scrollBars handleForm"
 (styleSymbol ~~ handleStyle) ifTrue:[
 	handleStyle := styleSymbol.
 	handleStyle == #next ifTrue:[
 	    shadowForm := self class shadowFormOn:device.
 ! !
 !VariableVerticalPanel methodsFor:'drawing'!
 drawHandleFormAtX:hx y:hy
+"draw a handles bitmap at hx/hy"
 self paint:shadowColor.
 self displayForm:shadowForm x:hx y:hy.
 self paint:lightColor.
 self displayForm:lightForm x:hx y:hy.
 self paint:viewBackground
 !
 drawHandleAtX:hx y:hy
+"draw a single handle at hx/hy"
 |h y m|
 shadowForm notNil ifTrue:[
 	h := shadowForm height
 ] ifFalse:[
 	h := barHeight - 4
 ].
-self paint:viewBackground.
+"/    self paint:viewBackground.
-self fillRectangleX:margin y:hy
+"/    self fillRectangleX:margin y:hy
-		  width:(width - margin - margin)
+"/                  width:(width - margin - margin)
-		  height:barHeight.
+"/                  height:barHeight.
 (handleStyle ~~ #normal and:[handleStyle ~~ #mswindows]) ifTrue:[
 	m := (barHeight - h) // 2.
 	shadowForm isNil ifTrue:[
 	    y := hy + (barHeight // 2).
 		self drawHandleAtX:(hPoint x) y:(hPoint y)
 	    ].
 	    movedHandle notNil ifTrue:[
 		self noClipByChildren.
 		self xoring:[
+		    |y|
 		    trackLine ifTrue:[
-			self displayLineFromX:0 y:prev+(barHeight // 2)
+			y := prev+(barHeight // 2).
-					  toX:width y:prev+(barHeight // 2).
+			self displayLineFromX:0 y:y toX:width y:y.
 		    ] ifFalse:[
 			self fillRectangleX:0 y:prev width:width height:barHeight
 		    ]
 		].
 		self clipByChildren
 	]
 ]
 !
 redraw
-"redraw the handles"
+"redraw all of the handles"
 redrawLocked ~~ true ifTrue:[
 	self redrawHandlesFrom:1 to:(subViews size)
 ]
 ! !
 		movedHandle := handle.
 		prev := hy.
 		start := by - hy.
 		self noClipByChildren.
 		self xoring:[
+		    |y|
 		    trackLine ifTrue:[
-			self displayLineFromX:0 y:hy+(barHeight // 2)
+			y := hy + (barHeight // 2).
-					  toX:width y:hy+(barHeight // 2).
+			self displayLineFromX:0 y:y toX:width y:y.
 		    ] ifFalse:[
 			self fillRectangleX:0 y:hy width:width height:barHeight
 		    ]
 		].
 		self clipByChildren.
 	]
 ].
 self noClipByChildren.
 self xoring:[
+	|halfHeight y|
 	trackLine ifTrue:[
-	    self displayLineFromX:0 y:prev+(barHeight // 2)
+	    halfHeight := barHeight // 2.
-			      toX:width y:prev+(barHeight // 2).
+	    y := prev + halfHeight.
-	    self displayLineFromX:0 y:ypos+(barHeight // 2)
+	    self displayLineFromX:0 y:y toX:width y:y.
-			      toX:width y:ypos+(barHeight // 2).
+	    y := ypos + halfHeight.
+	    self displayLineFromX:0 y:y toX:width y:y.
 	] ifFalse:[
 	    self fillRectangleX:0 y:prev width:width height:barHeight.
 	    self fillRectangleX:0 y:ypos width:width height:barHeight
 	]
 ].
 	"undo the last xor"
 	self noClipByChildren.
 	self xoring:[
+	    |y|
 	    trackLine ifTrue:[
-		self displayLineFromX:0 y:prev+(barHeight // 2)
+		y := prev + (barHeight // 2).
-				  toX:width y:prev+(barHeight // 2).
+		self displayLineFromX:0 y:y toX:width y:y.
 	    ] ifFalse:[
 		self fillRectangleX:0 y:prev width:width height:barHeight
 	    ].
 	].
 	self clipByChildren.
 	"compute the new relative heights"
 	aboveIndex := movedHandle.
 	belowIndex := movedHandle + 1.
+	movedHandle := nil.
 	aboveView := subViews at:aboveIndex.
 	belowView := subViews at:belowIndex.
 	oldY := aboveView relativeCorner y.
 	newY := (prev + start / height) asFloat.
 	aboveView relativeCorner:aboveView relativeCorner x @ newY.
 	belowView relativeOrigin:belowView relativeOrigin x @ newY.
-	movedHandle := nil.
+	redrawLocked := true.
 	oldY > newY ifTrue:[
 	    self resizeSubviewsFrom:aboveIndex to:belowIndex.
 	] ifFalse:[
 	    self resizeSubviewsFrom:belowIndex to:aboveIndex.
 	].
 	redrawLocked := true.
 	self redrawHandlesFrom:aboveIndex to:belowIndex.
 	redrawLocked := false.
 ] ifFalse:[
 	super buttonRelease:button x:x y:y

changeset 79	6d917a89f7b7
parent 70	14443a9ea4ec
child 95	7535cfca9509