FileBrowserV2PanelView.st
changeset 4609 303b9b434cda
parent 4360 959719f86629
child 5967 ff5e8356fcb7
--- a/FileBrowserV2PanelView.st	Wed Feb 26 13:39:46 2003 +0100
+++ b/FileBrowserV2PanelView.st	Wed Feb 26 13:40:11 2003 +0100
@@ -15,7 +15,7 @@
 "{ Package: 'stx:libtool' }"
 
 VariablePanel subclass:#FileBrowserV2PanelView
-	instanceVariableNames:'whichView visibilityHolder oldOrigin oldCorner'
+	instanceVariableNames:'whichView viewIsVisible visibilityHolder oldOrigin oldCorner'
 	classVariableNames:'BarHeight'
 	poolDictionaries:''
 	category:'Interface-Tools-File'
@@ -40,7 +40,6 @@
 !
 
 documentation
-
 "
     copy of the Panel from CBrowser , if a better HorizontalPanel and VerticalPanel is available
     the new version can be used here
@@ -50,22 +49,22 @@
 !FileBrowserV2PanelView methodsFor:'accessing'!
 
 visible:aState
-    |view1 view2 state|
+    |view1 view2 newVisible newOrigin1 newOrigin2 newCorner1 newCorner2|
 
-    state := aState ? true.
+    newVisible := aState ? true.
 
-    (state == self isVisible or:[subViews size ~~ 2]) ifTrue:[
+    ((newVisible == self isVisible) or:[subViews size ~~ 2]) ifTrue:[
         ^ self
     ].
+    viewIsVisible := newVisible.
 
     view1 := subViews at:1.
     view2 := subViews at:2.
 
-    state ifTrue:[
+    viewIsVisible ifTrue:[
         "
         MAKE VISIBLE
         "
-        barHeight := BarHeight.
         view1 origin:0.0@0.0   corner:oldCorner.
         view2 origin:oldOrigin corner:1.0@1.0.
         self  resizeSubviews.
@@ -73,30 +72,30 @@
         "
         MAKE INVISIBLE
         "
-        BarHeight := barHeight.
-        barHeight := 0.
         oldCorner := view1 relativeCorner.
         oldOrigin := view2 relativeOrigin.
 
         orientation == #vertical ifTrue:[
             whichView == #first ifTrue:[
-                view1 origin:0.0@0.0 corner:1.0@0.0.
-                view2 origin:0.0@0.0 corner:(view2 corner).
+                newOrigin1 := 0.0 @ 0.0. newCorner1 := 1.0 @ 0.0.
+                newOrigin2 := 0.0 @ 0.0. newCorner2 := view2 corner.
             ] ifFalse:[
-                view1 origin:0.0@0.0 corner:1.0@1.0.
-                view2 origin:0.0@1.0 corner:(view2 corner).
+                newOrigin1 := 0.0 @ 0.0. newCorner1 := 1.0 @ 1.0.
+                newOrigin2 := 0.0 @ 1.0. newCorner2 := view2 corner.
             ].
         ] ifFalse:[
             whichView == #first ifTrue:[
-                view1 origin:0.0@0.0 corner:0.0@1.0.
-                view2 origin:0.0@0.0 corner:1.0@1.0.
+                newOrigin1 := 0.0 @ 0.0. newCorner1 := 0.0 @ 1.0.
+                newOrigin2 := 0.0 @ 0.0. newCorner2 := 1.0 @ 1.0.
             ] ifFalse:[
-                view1 origin:0.0@0.0 corner:1.0@1.0.
-                view2 origin:1.0@0.0 corner:1.0@1.0.
+                newOrigin1 := 0.0 @ 0.0. newCorner1 := 1.0 @ 1.0.
+                newOrigin2 := 1.0 @ 0.0. newCorner2 := 1.0 @ 1.0.
             ]
-        ]
+        ].
+        view1 origin:newOrigin1 corner:newCorner1.
+        view2 origin:newOrigin2 corner:newCorner2.
     ].
-    visibilityHolder notNil ifTrue:[visibilityHolder value:state]
+    visibilityHolder notNil ifTrue:[visibilityHolder value:viewIsVisible]
 !
 
 whichView
@@ -141,10 +140,10 @@
 update:what with:aPara from:chgObj
 
     chgObj == visibilityHolder ifTrue:[
-	^ self visible:(chgObj value)
+        self visible:(chgObj value).
+        ^ self.
     ].
-    ^ super update:what with:aPara from:chgObj
-
+    super update:what with:aPara from:chgObj
 ! !
 
 !FileBrowserV2PanelView methodsFor:'initialization'!
@@ -157,7 +156,7 @@
 initialize
     orientation := #vertical.
     whichView   := #first.
-
+    viewIsVisible := true.
     super initialize
 !
 
@@ -180,7 +179,7 @@
 !
 
 isVisible
-    ^ barHeight ~~ 0
+    ^ viewIsVisible 
 !
 
 specClass
@@ -190,5 +189,5 @@
 !FileBrowserV2PanelView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2PanelView.st,v 1.2 2002-12-10 11:03:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2PanelView.st,v 1.3 2003-02-26 12:40:11 cg Exp $'
 ! !