HorizontalScrollBar.st
changeset 713 0c38ad51016d
parent 612 eb88f8e2df2c
child 762 832730063164
--- a/HorizontalScrollBar.st	Tue May 28 22:20:48 1996 +0200
+++ b/HorizontalScrollBar.st	Wed May 29 12:20:58 1996 +0200
@@ -257,42 +257,48 @@
 
     |w h leftForm rightForm wLeft hLeft wRight hRight style|
 
+    preferredExtent notNil ifTrue:[
+        ^ preferredExtent
+    ].
+
     "need fix - this is a kludge;
      the if should not be needed ..."
     style := styleSheet name.
     style == #mswindows ifTrue:[
-	h := button1 height max:button2 height.
-	w := button1 width + button2 width + (Scroller defaultExtent x).
+        h := button1 height max:button2 height.
+        w := button1 width + button2 width + (Scroller defaultExtent x).
     ] ifFalse:[
-	leftForm  := ArrowButton leftArrowButtonForm:style on:device.
-	rightForm := ArrowButton rightArrowButtonForm:style on:device.
-	"
-	 just in case ...
-	"
-	leftForm isNil ifTrue:[
-	    wLeft := hLeft := 16
-	] ifFalse:[
-	    wLeft := leftForm width.
-	    hLeft := leftForm height
-	].
-	rightForm isNil ifTrue:[
-	    wRight := hRight := 16
-	] ifFalse:[
-	    wRight := rightForm width.
-	    hRight := rightForm height
-	].
-	w := wLeft + wRight + (1 * 2) + (HorizontalScroller defaultExtent x).
-	h := hLeft max:hRight.
-	(style ~~ #normal) ifTrue:[
-	    h := h + 4.
-	    w := w + 4
-	].
+        leftForm  := ArrowButton leftArrowButtonForm:style on:device.
+        rightForm := ArrowButton rightArrowButtonForm:style on:device.
+        "
+         just in case ...
+        "
+        leftForm isNil ifTrue:[
+            wLeft := hLeft := 16
+        ] ifFalse:[
+            wLeft := leftForm width.
+            hLeft := leftForm height
+        ].
+        rightForm isNil ifTrue:[
+            wRight := hRight := 16
+        ] ifFalse:[
+            wRight := rightForm width.
+            hRight := rightForm height
+        ].
+        w := wLeft + wRight + (1 * 2) + (HorizontalScroller defaultExtent x).
+        h := hLeft max:hRight.
+        (style ~~ #normal) ifTrue:[
+            h := h + 4.
+            w := w + 4
+        ].
     ].
     ^ w @ h.
+
+    "Modified: 29.5.1996 / 12:12:26 / cg"
 ! !
 
 !HorizontalScrollBar class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/HorizontalScrollBar.st,v 1.18 1996-05-03 23:07:52 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/HorizontalScrollBar.st,v 1.19 1996-05-29 10:18:58 cg Exp $'
 ! !