hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:7224d23c4a37
+:cb1e13d68761
 "{ Package: 'stx:libtool2' }"
 ResourceSpecEditor subclass:#UIPainter
 	instanceVariableNames:'specSuperclassName treeView selectionPanel specTool layoutTool
 		helpTool painterView painter'
-	classVariableNames:''
+	classVariableNames:'UseViewScroller'
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 SelectionInTreeView subclass:#TreeView
 ! !
 !UIPainter methodsFor:'initialization'!
 initialize
-|name|
+|name scroller viewScroller|
 super initialize.
 modified := false.
 aspects := IdentityDictionary new.
 name := name ? UIPainter defaultNameOfCanvas.
 painterView beToolWindow.
 painterView name:name.
 painterView label:name.
 painterView extent:(treeView windowSpecClass defaultExtentInUIPainter).
-painter := UIPainterView in:painterView.
-painter layout:(0.0 @ 0.0 corner:1.0 @ 1.0) asLayout.
+UseViewScroller == true ifTrue:[
+scroller := HVScrollableView for:ViewScroller in:painterView.
+scroller
+horizontalScrollable:true miniScroller:true;
+verticalScrollable:true; verticalMini:true;
+autoHideScrollBars:false;
+layout:(0.0 @ 0.0 corner:1.0 @ 1.0) asLayout.
+viewScroller := scroller scrolledView.
+painter := UIPainterView new.
+painter extent:300@300.
+viewScroller scrolledView:painter.
+] ifFalse:[
+painter := UIPainterView in:painterView.
+painter layout:(0.0 @ 0.0 corner:1.0 @ 1.0) asLayout.
+].
 treeView := treeView canvas:painter specName:name.
 painter treeView:treeView.
 treeView model addDependent:self.
 painter enableChannel:(self enableChannel).
 "sets view for layout tool"
 |type|
 self painter topView == aView ifTrue:[
-	type := #Extent
+type := #Extent
+] ifFalse:[
+self canvas == aView ifTrue:[
+type := #Extent
+]
 ].
 self layoutTool layoutView:aView type:type spec:aSpec
 !
 specClass
 specClass isNil ifTrue:[
 specClassName notNil ifTrue:[
 "Modified: / 31-08-2006 / 10:10:22 / cg"
 ! !
 !UIPainter methodsFor:'private-tools'!
+canvas
+"returns the canvas view"
+UseViewScroller == true ifTrue:[
+^ painter.
+].
+^ painter topView.
+"/    ^ treeView canvas
+"Modified: / 05-09-2006 / 18:36:32 / cg"
+!
 helpTool
 "returns the help tool"
 helpTool isNil ifTrue:[self noteBookView].
 selectedSpecAndView
 |spec view property|
 treeView isCanvasSelected ifTrue:[
 spec := treeView canvasSpec.
-view := self painter topView.
+view := self canvas. "/ self painter topView.
 ] ifFalse:[
 (property := treeView propertySelected) notNil ifTrue:[
 treeView canResizeSelectedWidget ifTrue:[
 view := property view.
 ].
 (layout := layoutTool layout) notNil ifTrue:[
 layoutTool layoutType == #Extent ifTrue:[
 layoutView := layoutTool layoutView.
-layoutView == painter topView ifTrue:[
+layoutView == self canvas ifTrue:[
-layoutView extent:layout
+layoutView extent:layout.
+UseViewScroller == true ifTrue:[
+layoutView container container sizeChanged:nil.
+].
 ] ifFalse:[
 spec useDefaultExtent:(layoutTool aspectFor:#useDefaultExtent) value.
 spec useDefaultExtent ifTrue:[
 "/ temporarily unfreeze the widgets size
 "/ (but remember, the old setting, which is actually
 !
 doSave
 "saves the window spec"
-|code painter specClass|
+|code painter specClass extentUsed|
 self askForSectionModification.
 self hasSpecClassAndSelector ifFalse:[
 self doDefineClassAndSelector isNil ifTrue:[
 ^ nil
 superclassName:specSuperclassName
 selector:specSelector.
 "/    Transcript showCR:'generating windowSpec code...'.
-(painter topView extent > (800 @ 600)) ifTrue:[
+extentUsed := self canvas extent.
+(extentUsed > (800 @ 600)) ifTrue:[
 Dialog
 warn:(resources
 stringWithCRs:'The application''s default window-size is taken from the current size and will be %1.\\This may be too small on some displays - if required, resize and save again.'
-with:painter topView extent printString allBold)
+with:extentUsed printString allBold)
 ].
 code := painter generateWindowSpecMethodSource withCRs.
 (ReadStream on:code) fileIn.
 self doGenerateAspectSelectorsMethod.
 self setAttributesFromWindowSpec:aSpec.
 spec := aSpec copy.
 spec  menu:nil.
 spec flags:nil.
-spec setAttributesIn:(self canvas topView) with:(UIBuilder new isEditing:true).
+spec setAttributesIn:(self canvas "topView") with:(UIBuilder new isEditing:true).
 !
 exportedAspects
 "returns spec assigned to canvas"
 |fullSpec winSpec|
 fullSpec := FullSpec new.
 fullSpec name:specNameSymbol.
-fullSpec fromBuilder:(self canvas topView)
+fullSpec fromBuilder:(self canvas)
-	      components:(SpecCollection new collection:aSpecArray).
+components:(SpecCollection new collection:aSpecArray).
 windowSpec notNil ifTrue:[
-	winSpec := fullSpec window.
+winSpec := fullSpec window.
-	winSpec copyValuesFromSpec:windowSpec.
+winSpec copyValuesFromSpec:windowSpec.
-	winSpec name: winSpec label.
+winSpec name: winSpec label.
 ].
 ^ fullSpec literalArrayEncoding.
 !
 setAttributesFromWindowSpec:aWindowSpec
 "sets a window spec from aWindowSpec and applies some attributes
 to the canvas."

changeset 2213	cb1e13d68761
parent 2210	0a2c19976d82
child 2217	b54632779619