diff -r d83c307f3bf5 -r 96d6feeeb049 UIPainter.st --- a/UIPainter.st Fri May 23 16:28:06 1997 +0200 +++ b/UIPainter.st Sat May 24 05:07:29 1997 +0200 @@ -1,6 +1,6 @@ ApplicationModel subclass:#UIPainter instanceVariableNames:'objectList currentView selectionPanel tabSelection lastSlice - specView layoutTool emptyView fileName specClass specSelector + specView layoutTool fileName specClass specSelector specSuperclass aspects' classVariableNames:'' poolDictionaries:'' @@ -755,13 +755,11 @@ noteBook := View origin:0.0 @0.0 corner:1.0@1.0. layoutTool := UIPropertyView for:#Dimension in:noteBook. specView := UIPropertyView for:#Specification in:noteBook. - emptyView := View origin:0.0 @0.0 corner:1.0@1.0 in:noteBook. channel := self modifiedChannel. layoutTool modifiedHolder:channel. specView modifiedHolder:channel. specView viewBackground:(layoutTool viewBackground). - emptyView viewBackground:(layoutTool viewBackground). builder aspectAt:#noteBookView put:noteBook. ]. ^ noteBook @@ -775,7 +773,7 @@ "returns a block which returns the menu !!hack!! " - ^ [ (self painter menu) startUp. nil ]. + ^ [ self painter showMiddleButtonMenu ]. @@ -866,6 +864,8 @@ (list findFirst:[:aName| aName = lastSlice]) ~~ 0 ifTrue:[ setSel := lastSlice ] + ] ifTrue:[ + layoutTool forView:nil ]. specView specEdited:spec. @@ -916,23 +916,26 @@ tabSelection:something |specEdited slices spec idx| - (tabSelection := something) notNil ifTrue:[ - (specEdited := specView specEdited) notNil ifTrue:[ - slices := specEdited class slices. - lastSlice := tabSelection. + something isNil ifTrue:[^ self]. + + tabSelection := something. + + (specEdited := specView specEdited) notNil ifTrue:[ + slices := specEdited class slices. + lastSlice := tabSelection. - idx:= slices findFirst:[:aSlice| aSlice first = tabSelection ]. - idx == 0 ifTrue:[ - layoutTool forView:currentView. - ^ layoutTool raise. - ]. - spec := specEdited class perform:((slices at:idx) last). - ] + idx:= slices findFirst:[:aSlice| aSlice first = tabSelection ]. + idx == 0 ifTrue:[ + layoutTool forView:currentView. + ^ layoutTool raise. + ]. + spec := specEdited class perform:((slices at:idx) last). ]. + specView raise. + specEdited isNil ifTrue:[ - emptyView raise + specView buildFromSpec:nil ] ifFalse:[ - specView raise. specView buildFromSpec:spec ] ! !