# HG changeset patch # User tm # Date 931949033 -7200 # Node ID a631dc401a715760d67a26091b1afb252d5e5e15 # Parent a043422d056500b9aff06573f140ecd7ddc56c3c remember builders old spec&source, when reused to build a subcanvas. diff -r a043422d0565 -r a631dc401a71 AppModel.st --- a/AppModel.st Wed Jul 14 12:42:27 1999 +0200 +++ b/AppModel.st Wed Jul 14 12:43:53 1999 +0200 @@ -1414,13 +1414,16 @@ buildSubCanvas:spec withBuilder:aBuilder "build a subcanvases spec into aSubcanvas" - |sameApp| + |sameApp prevSpec prevSource| builder isNil ifTrue:[ builder := aBuilder. aBuilder isNil ifTrue:[ self createBuilder ] + ] ifFalse:[ + prevSpec := aBuilder spec. + prevSource := aBuilder source. ]. aBuilder source:self. @@ -1444,6 +1447,13 @@ ] ifFalse:[ self postBuildWith:aBuilder. ]. + + prevSpec notNil ifTrue:[ + "/ restore state in builder if original builder was used + aBuilder spec:prevSpec. + aBuilder source:prevSource. + ]. + ^ aBuilder "Created: / 18.6.1998 / 20:08:45 / cg" @@ -2106,6 +2116,6 @@ !ApplicationModel class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.107 1999-07-05 22:00:33 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/Attic/AppModel.st,v 1.108 1999-07-14 10:43:53 tm Exp $' ! ! ApplicationModel initialize! diff -r a043422d0565 -r a631dc401a71 ApplicationModel.st --- a/ApplicationModel.st Wed Jul 14 12:42:27 1999 +0200 +++ b/ApplicationModel.st Wed Jul 14 12:43:53 1999 +0200 @@ -1414,13 +1414,16 @@ buildSubCanvas:spec withBuilder:aBuilder "build a subcanvases spec into aSubcanvas" - |sameApp| + |sameApp prevSpec prevSource| builder isNil ifTrue:[ builder := aBuilder. aBuilder isNil ifTrue:[ self createBuilder ] + ] ifFalse:[ + prevSpec := aBuilder spec. + prevSource := aBuilder source. ]. aBuilder source:self. @@ -1444,6 +1447,13 @@ ] ifFalse:[ self postBuildWith:aBuilder. ]. + + prevSpec notNil ifTrue:[ + "/ restore state in builder if original builder was used + aBuilder spec:prevSpec. + aBuilder source:prevSource. + ]. + ^ aBuilder "Created: / 18.6.1998 / 20:08:45 / cg" @@ -2106,6 +2116,6 @@ !ApplicationModel class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.107 1999-07-05 22:00:33 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.108 1999-07-14 10:43:53 tm Exp $' ! ! ApplicationModel initialize!