--- a/ScrollableView.st Sat Nov 10 00:34:13 2018 +0100
+++ b/ScrollableView.st Sat Nov 10 00:35:10 2018 +0100
@@ -2260,6 +2260,32 @@
!ScrollableView methodsFor:'queries'!
+computePreferredExtent
+ "return my preferredExtent from the scrolledViews prefExtent
+ plus the size of the scrollBar"
+
+ |slavesPref prefX prefY margin|
+
+ scrolledView notNil ifTrue:[
+ slavesPref := scrolledView preferredExtent.
+ prefX := slavesPref x.
+ prefY := slavesPref y.
+ margin := (DefaultScrolledViewMargin * 2) + DefaultScrollBarSpacing.
+ vScrollBar notNil ifTrue:[
+ prefX := prefX + vScrollBar width + margin.
+ ].
+ hScrollBar notNil ifTrue:[
+ prefY := prefY + hScrollBar height + margin.
+ ].
+
+ ^ prefX @ prefY.
+ ].
+
+ ^ super computePreferredExtent.
+
+ "Created: / 09-11-2018 / 20:00:15 / Claus Gittinger"
+!
+
isHorizontalScrollable
"return true if I am horizontally scrollable"
@@ -2295,43 +2321,6 @@
"Created: 6.3.1997 / 18:06:23 / cg"
!
-preferredExtent
- "return my preferredExtent from the scrolledViews prefExtent
- plus the size of the scrollBar"
-
- |slavesPref prefX prefY margin|
-
- "/ If I have an explicit preferredExtent..
- explicitExtent notNil ifTrue:[
- ^ explicitExtent
- ].
-
- "/ If I have a cached preferredExtent value..
- preferredExtent notNil ifTrue:[
- ^ preferredExtent
- ].
-
- scrolledView notNil ifTrue:[
- slavesPref := scrolledView preferredExtent.
- prefX := slavesPref x.
- prefY := slavesPref y.
- margin := (DefaultScrolledViewMargin * 2) + DefaultScrollBarSpacing.
- vScrollBar notNil ifTrue:[
- prefX := prefX + vScrollBar width + margin.
- ].
- hScrollBar notNil ifTrue:[
- prefY := prefY + hScrollBar height + margin.
- ].
-
- ^ prefX @ prefY.
- ].
-
- ^ super preferredExtent.
-
- "Created: 6.3.1997 / 18:06:24 / cg"
- "Modified: 6.3.1997 / 22:34:09 / cg"
-!
-
preferredExtentForLines:numLines cols:numCols
"return my preferredExtent from the scrolledViews prefExtent
plus the size of the scrollBar"