--- a/DSVLabelView.st Thu Aug 22 15:47:49 2002 +0200
+++ b/DSVLabelView.st Thu Aug 22 16:13:09 2002 +0200
@@ -490,15 +490,6 @@
enabled := aState.
!
-isVisible:aBool
-
- aBool ~~ self isVisible ifTrue:[
-"/ dataSet layout:nil.
- super isVisible:aBool.
- dataSet recomputeLayout.
- ].
-!
-
preferredHeight
|h|
@@ -612,5 +603,5 @@
!DSVLabelView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.45 2002-08-22 13:47:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.46 2002-08-22 14:13:06 cg Exp $'
! !
--- a/DataSetView.st Thu Aug 22 15:47:49 2002 +0200
+++ b/DataSetView.st Thu Aug 22 16:13:09 2002 +0200
@@ -272,7 +272,8 @@
update:something with:aParameter from:changedObject
changedObject == labelView ifTrue:[
- (something == #columnLayout) ifTrue:[
+ ((something == #columnLayout)
+ or:[something == #visibility]) ifTrue:[
self recomputeLayouts.
^ self
].
@@ -325,7 +326,7 @@
columnView containerChangedSize.
]
].
-"/ labelView containerChangedSize.
+ labelView containerChangedSize.
!
scrolledViewLayout:aLayout
@@ -336,25 +337,29 @@
"/ always copy - since layout it destructively modified in #recomputeLayouts
modifiedLayout := aLayout copy.
+
+ originalTopOffset := scrolledViewLayout topOffset.
labelView isVisible ifTrue:[
- originalTopOffset := scrolledViewLayout topOffset.
modifiedLayout topOffset:(originalTopOffset + labelView height).
+ ].
- newLeft := aLayout leftOffset.
- newRight := aLayout rightOffset.
+ newLeft := aLayout leftOffset.
+ newRight := aLayout rightOffset.
- (scrolledView level == 0
- and:[self level < 0
- and:[labelView level == 0]]) ifTrue:[
- newRight := (newRight + 1) min:0.
- modifiedLayout rightOffset:newRight.
- ].
+ (scrolledView level == 0
+ and:[self level < 0
+ and:[labelView level == 0]]) ifTrue:[
+ newRight := (newRight + 1) min:0.
+ modifiedLayout rightOffset:newRight.
+ ].
- labelViewLayout := labelView layout.
- labelViewLayout topOffset:originalTopOffset.
- labelViewLayout
- leftOffset:newLeft
- rightOffset:newRight.
+ labelViewLayout := labelView layout.
+ labelViewLayout topOffset:originalTopOffset.
+ labelViewLayout
+ leftOffset:newLeft
+ rightOffset:newRight.
+
+ labelView isVisible ifTrue:[
labelView containerChangedSize.
].
super scrolledViewLayout:modifiedLayout
@@ -371,5 +376,5 @@
!DataSetView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/DataSetView.st,v 1.35 2002-08-22 13:46:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/DataSetView.st,v 1.36 2002-08-22 14:13:09 cg Exp $'
! !