# HG changeset patch # User ah # Date 822497381 -3600 # Node ID 0823ef38e62924ff2bdd694d46bace1c23f7928e # Parent d2f955840ad5ba2df4d7bf2a1e66ef73f7eb2bd9 adding/removing views to Panels diff -r d2f955840ad5 -r 0823ef38e629 ScrView.st --- a/ScrView.st Wed Jan 24 14:25:52 1996 +0100 +++ b/ScrView.st Wed Jan 24 16:29:41 1996 +0100 @@ -345,17 +345,18 @@ The view will have full scrollbars if the corresponding miniH/miniV is false, miniscrollers if true." - |newView| + |newView dev| aView notNil ifTrue:[ - newView := self basicNew. - newView device:(aView device). + dev := aView device + ] ifFalse:[ + dev := Screen current + ]. + newView := self basicNew device:dev. + newView initializeFor:aViewClass miniScrollerH:miniH miniScrollerV:miniV. + aView notNil ifTrue:[ aView addSubView:newView - ] ifFalse:[ - "create on Display by default" - newView := self basicNew device:Display. ]. - newView initializeFor:aViewClass miniScrollerH:miniH miniScrollerV:miniV. ^ newView ! @@ -855,5 +856,5 @@ !ScrollableView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.23 1995-12-10 16:53:46 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.24 1996-01-24 15:29:36 ah Exp $' ! ! diff -r d2f955840ad5 -r 0823ef38e629 ScrollableView.st --- a/ScrollableView.st Wed Jan 24 14:25:52 1996 +0100 +++ b/ScrollableView.st Wed Jan 24 16:29:41 1996 +0100 @@ -345,17 +345,18 @@ The view will have full scrollbars if the corresponding miniH/miniV is false, miniscrollers if true." - |newView| + |newView dev| aView notNil ifTrue:[ - newView := self basicNew. - newView device:(aView device). + dev := aView device + ] ifFalse:[ + dev := Screen current + ]. + newView := self basicNew device:dev. + newView initializeFor:aViewClass miniScrollerH:miniH miniScrollerV:miniV. + aView notNil ifTrue:[ aView addSubView:newView - ] ifFalse:[ - "create on Display by default" - newView := self basicNew device:Display. ]. - newView initializeFor:aViewClass miniScrollerH:miniH miniScrollerV:miniV. ^ newView ! @@ -855,5 +856,5 @@ !ScrollableView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.23 1995-12-10 16:53:46 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.24 1996-01-24 15:29:36 ah Exp $' ! ! diff -r d2f955840ad5 -r 0823ef38e629 VarPanel.st --- a/VarPanel.st Wed Jan 24 14:25:52 1996 +0100 +++ b/VarPanel.st Wed Jan 24 16:29:41 1996 +0100 @@ -203,6 +203,7 @@ v2 origin:0.0 @ 0.5 corner:1.0 @ 1.0. v2 contents:'another text'. p addSubView:v2. + v2 realize. ] ifFalse:[ b label:'show'. v2 destroy. @@ -364,7 +365,6 @@ super addSubView:aView. realized ifTrue:[ self resizeSubviews. - aView realize. ] "Created: 17.1.1996 / 22:41:00 / cg" @@ -966,33 +966,29 @@ |pos delta| - self anyNonRelativeSubviews ifTrue:[ - "/ there is at least one subview without - "/ relative origin/extent - setup all subviews - "/ to spread evenly ... + "/ setup all subviews to spread evenly ... - pos := 0.0. - delta := 1.0 / (subViews size). + pos := 0.0. + delta := 1.0 / (subViews size). - 1 to:(subViews size) do:[:index | - |view| + 1 to:(subViews size) do:[:index | + |view| - view := subViews at:index. - orientation == #vertical ifTrue:[ - index == subViews size ifTrue:[ - view origin:(0.0 @ pos) corner:(1.0 @ 1.0) - ] ifFalse:[ - view origin:(0.0 @ pos) corner:(1.0 @ (pos + delta)) - ]. + view := subViews at:index. + orientation == #vertical ifTrue:[ + index == subViews size ifTrue:[ + view origin:(0.0 @ pos) corner:(1.0 @ 1.0) ] ifFalse:[ - index == subViews size ifTrue:[ - view origin:(pos @ 0.0) corner:(1.0 @ 1.0) - ] ifFalse:[ - view origin:(pos @ 0.0) corner:((pos + delta) @ 1.0) - ]. + view origin:(0.0 @ pos) corner:(1.0 @ (pos + delta)) ]. - pos := pos + delta - ] + ] ifFalse:[ + index == subViews size ifTrue:[ + view origin:(pos @ 0.0) corner:(1.0 @ 1.0) + ] ifFalse:[ + view origin:(pos @ 0.0) corner:((pos + delta) @ 1.0) + ]. + ]. + pos := pos + delta ] ! ! @@ -1043,5 +1039,5 @@ !VariablePanel class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/Attic/VarPanel.st,v 1.2 1996-01-24 13:25:52 ah Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/Attic/VarPanel.st,v 1.3 1996-01-24 15:29:41 ah Exp $' ! ! diff -r d2f955840ad5 -r 0823ef38e629 VariablePanel.st --- a/VariablePanel.st Wed Jan 24 14:25:52 1996 +0100 +++ b/VariablePanel.st Wed Jan 24 16:29:41 1996 +0100 @@ -203,6 +203,7 @@ v2 origin:0.0 @ 0.5 corner:1.0 @ 1.0. v2 contents:'another text'. p addSubView:v2. + v2 realize. ] ifFalse:[ b label:'show'. v2 destroy. @@ -364,7 +365,6 @@ super addSubView:aView. realized ifTrue:[ self resizeSubviews. - aView realize. ] "Created: 17.1.1996 / 22:41:00 / cg" @@ -966,33 +966,29 @@ |pos delta| - self anyNonRelativeSubviews ifTrue:[ - "/ there is at least one subview without - "/ relative origin/extent - setup all subviews - "/ to spread evenly ... + "/ setup all subviews to spread evenly ... - pos := 0.0. - delta := 1.0 / (subViews size). + pos := 0.0. + delta := 1.0 / (subViews size). - 1 to:(subViews size) do:[:index | - |view| + 1 to:(subViews size) do:[:index | + |view| - view := subViews at:index. - orientation == #vertical ifTrue:[ - index == subViews size ifTrue:[ - view origin:(0.0 @ pos) corner:(1.0 @ 1.0) - ] ifFalse:[ - view origin:(0.0 @ pos) corner:(1.0 @ (pos + delta)) - ]. + view := subViews at:index. + orientation == #vertical ifTrue:[ + index == subViews size ifTrue:[ + view origin:(0.0 @ pos) corner:(1.0 @ 1.0) ] ifFalse:[ - index == subViews size ifTrue:[ - view origin:(pos @ 0.0) corner:(1.0 @ 1.0) - ] ifFalse:[ - view origin:(pos @ 0.0) corner:((pos + delta) @ 1.0) - ]. + view origin:(0.0 @ pos) corner:(1.0 @ (pos + delta)) ]. - pos := pos + delta - ] + ] ifFalse:[ + index == subViews size ifTrue:[ + view origin:(pos @ 0.0) corner:(1.0 @ 1.0) + ] ifFalse:[ + view origin:(pos @ 0.0) corner:((pos + delta) @ 1.0) + ]. + ]. + pos := pos + delta ] ! ! @@ -1043,5 +1039,5 @@ !VariablePanel class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/VariablePanel.st,v 1.2 1996-01-24 13:25:52 ah Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/VariablePanel.st,v 1.3 1996-01-24 15:29:41 ah Exp $' ! !