hg/stx-libtool2: comparison Tools__ViewTreeApplication.st

equal deleted inserted replaced

-:4867f3e9dd43
+:93aaf62a6b95
 "{ NameSpace: Tools }"
 ApplicationModel subclass:#ViewTreeApplication
 	instanceVariableNames:'model treeView hasSingleSelectionHolder clickedItem clickedPoint
-		motionAction infoChannel testModeChannel process
+		motionAction infoChannel process followFocusChannel
-		followFocusChannel showNamesHolder'
+		showNamesHolder'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'A-Views-Support'
 !
 menu: middleButtonMenu
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 miniScrollerHorizontal: true
 miniScrollerVertical: false
-backgroundColor: (Color 49.999237048905 49.999237048905 100.0)
 listModel: listOfItems
 multipleSelectOk: true
 useIndex: false
 highlightMode: label
 doubleClickSelector: doubleClicked:
 label: 'Pick a View'
 itemValue: doPickViews
 translateLabel: true
 )
 (MenuItem
-enabled: hasPickedView
+enabled: hasTargetWidgetChannel
 label: 'Release Picked View'
 itemValue: doUnpick
 translateLabel: true
 )
 (MenuItem
 label: 'Menu'
 translateLabel: true
 submenuChannel: middleButtonMenu
 )
 (MenuItem
+enabled: hasTargetWidgetChannel
 label: 'Components'
 translateLabel: true
 startGroup: right
 submenuChannel: submenuComponents:
 )
 (MenuItem
+enabled: hasTargetWidgetChannel
 label: 'Applications'
 translateLabel: true
 submenuChannel: submenuApplications:
 )
 )
 translateLabel: false
 labelImage: (ResourceRetriever ToolbarIconLibrary inspect22x24Icon 'Application')
 argument: application
 )
 (MenuItem
-label: '-'
+label: ''
 )
 (MenuItem
 enabled: hasSingleSelectionHolder
 label: 'Widget'
 itemValue: doBrowse:
 ! !
 !ViewTreeApplication methodsFor:'aspects'!
 followFocusChannel
-"boolean holder, which indicates whether selection changed dependend on the focus view
+"boolean holder, which indicates whether selection changed dependend on the focus view"
-"
 ^ followFocusChannel
 !
 hasSingleSelectionHolder
-"boolean holder, true if one item is selected
+"boolean holder, true if one item is selected"
-"
 ^ hasSingleSelectionHolder
 !
+hasTargetWidgetChannel
+"answer the channel which is set to true if a target widget exists"
+^ model hasTargetWidgetChannel
+!
 infoChannel
-"channel, which keeps a printable information
+"channel, which keeps a printable information"
-"
 ^ infoChannel
 !
 listOfItems
-"returns the hierarchical list of items
+"returns the hierarchical list of items"
-"
 ^ model listOfItems
 !
 model
-"returns my selection model, a ViewTreeModel
+"returns my selection model, a ViewTreeModel"
-"
 ^ model
 !
 selectOnClickHolder
-"boolean holder, which indicates whether the selection will change on click
+"boolean holder, which indicates whether the selection will change on click"
-"
 ^ model selectOnClickHolder
 !
 showNamesHolder
 "boolean holder, which indicates whether application names or widget names
-as additional text are shown for the items
+as additional text are shown for the items"
-"
 ^ showNamesHolder
 !
 testModeChannel
-"boolean holder, which indicates whether running in test or edit mode (eat input events)
+"answer a boolean channel which describes the behaviour how to process
-"
+events on the target view.
-^ testModeChannel
+false: all input events are eaten and the selection is shown on the target view.
+true:  no  input events are eaten and no  selection is shown on the target view."
+^ model testModeChannel
 ! !
 !ViewTreeApplication methodsFor:'change & update'!
 selectionChanged
-"called if the selection changed
+"called if the selection changed"
-"
 |info view item|
 item := model selectedItem.
 item notNil ifTrue:[ |state|
 !
 update:something with:someArgument from:aModel
 |oldSelection|
-oldSelection := model selectedItem.
-aModel == testModeChannel ifTrue:[
-model selectedItem:nil.
-model testMode:(testModeChannel value).
-model selectedItem:oldSelection.
-^ self
-].
 aModel == showNamesHolder ifTrue:[
+oldSelection := model selectedItem.
 model selectedItem:nil.
 self listOfItems showWidgetNames:(aModel value).
 model selectedItem:oldSelection.
 ^ self
 ].
 ! !
 !ViewTreeApplication methodsFor:'event processing'!
 processButtonMotionEvent:ev
-"handle a button motion event
+"handle a button motion event"
-"
-|click|
+|click rootView|
-motionAction notNil ifTrue:[
+motionAction isNil ifTrue:[^ self].
-click := ev view sensor mousePoint.
+(rootView := model rootView) isNil ifTrue:[
-click = clickedPoint ifFalse:[
+clickedItem := motionAction := nil.
-(clickedItem isNil or:[(click dist:clickedPoint) > 5.0]) ifTrue:[
+^ self
-motionAction value:click
+].
-]
+click := rootView device
+translatePoint:((ev x)@ (ev y))
+fromView:(ev view)
+toView:rootView.
+click = clickedPoint ifFalse:[
+(clickedItem isNil or:[(click dist:clickedPoint) > 5.0]) ifTrue:[
+motionAction value:click
 ]
 ].
 !
 processButtonPressEvent:ev
-"handle a buttopn press event
+"handle a buttopn press event"
-"
-|sensor lastRectangle|
+|rootView sensor lastRectangle|
+rootView    := model rootView.
 sensor      := model rootView sensor.
 clickedItem := model listOfItems detectItemRespondsToView:(ev view).
 (sensor ctrlDown or:[sensor shiftDown]) ifTrue:[
 clickedItem notNil ifTrue:[
 self selectOnClickHolder value ifTrue:[
 model toggleSelectItem:clickedItem
 ].
 ].
 clickedItem := motionAction := nil.
-] ifFalse:[
+^ self
-clickedPoint  := ev view sensor mousePoint.
+].
-lastRectangle := nil.
+clickedPoint := rootView device translatePoint:((ev x)@ (ev y))  fromView:(ev view) toView:rootView.
-motionAction :=[:p| |rootView|
+lastRectangle := nil.
-rootView    := model rootView device rootView.
-clickedItem := nil.
+motionAction :=[:p|
+rootView    := model rootView device rootView.
-rootView xoring:[
+rootView    := model rootView.
-lastRectangle notNil ifTrue:[ rootView displayRectangle:lastRectangle ]
+clickedItem := nil.
-ifFalse:[ rootView clippedByChildren:false ].
+rootView xoring:[
-p isNil ifTrue:[
+lastRectangle notNil ifTrue:[ rootView displayRectangle:lastRectangle ]
-rootView clippedByChildren:true.
+ifFalse:[ rootView clippedByChildren:false ].
-motionAction := nil.
-] ifFalse:[
+p isNil ifTrue:[
-lastRectangle := Rectangle origin:(clickedPoint min:p) corner:(clickedPoint max:p).
+rootView clippedByChildren:true.
-rootView displayRectangle:lastRectangle.
+motionAction := nil.
-].
+] ifFalse:[
-rootView flush.
+lastRectangle := Rectangle origin:(clickedPoint min:p) corner:(clickedPoint max:p).
+rootView displayRectangle:lastRectangle.
 ].
-lastRectangle
+rootView flush.
-]
+].
-]
+lastRectangle
+].
 !
 processButtonReleaseEvent:anEvent
-"handle a button release event
+"handle a button release event"
-"
 |rootView rectangle newItems widget origin|
+(rootView := model rootView) isNil ifTrue:[
+clickedItem := motionAction := nil.
+^ self
+].
 motionAction isNil ifTrue:[ ^ self ].
 clickedItem notNil ifTrue:[ ^ model selectItem:clickedItem ].
-(rectangle := motionAction value:nil) notNil ifTrue:[
+rectangle := motionAction value:nil.
-rootView  := model rootView device rootView.
+rectangle isNil ifTrue:[^ self].
-newItems := OrderedCollection new.
+newItems := OrderedCollection new.
-model rootItem recursiveDo:[:anItem|
-widget := anItem widget.
+model rootItem recursiveDo:[:anItem|
-origin := widget originRelativeTo:rootView.
+widget := anItem widget.
+origin := widget originRelativeTo:rootView.
-(rectangle containsRect:(Rectangle origin:origin extent:(widget extent))) ifTrue:[
-newItems add:anItem.
+(rectangle containsRect:(Rectangle origin:origin extent:(widget extent))) ifTrue:[
-]
+newItems add:anItem.
-].
+]
-model value:newItems.
+].
-].
+model value:newItems.
 !
 processEvent:anEvent
-"process an event
+"process an event"
-"
 |button menu|
 anEvent isKeyPressEvent ifTrue:[ ^ self processKeyPressEvent:anEvent ].
 anEvent isButtonEvent  ifFalse:[ ^ self ].
 ].
 ].
 !
 processKeyPressEvent:anEvent
-"process an key press event
+"process an key press event"
-"
 |item prnt idx key max next|
 key := anEvent key.
 key isSymbol ifFalse:[^ self].
 ^ self.
 ].
 !
 processMappedView:aView
-"process a mapped event
+"process a mapped event"
-"
 |parent anchor|
 parent := self listOfItems detectItemRespondsToView:aView.
 parent isNil ifTrue:[ ^ self ].
 ! !
 !ViewTreeApplication methodsFor:'initialization & release'!
 closeDownViews
-"release the grapped application
+"release the grapped application"
-"
 process := nil.
 super closeDownViews.
 self doUnpick.
 !
 initialize
-"setup my model and channels
+"setup my model and channels"
-"
 super initialize.
 infoChannel              := ''    asValue.
 hasSingleSelectionHolder := false asValue.
 followFocusChannel       := false asValue.
 model := ViewTreeModel new.
 model inputEventAction:[:ev| self processEvent:ev ].
 model mappedViewAction:[:vw| self processMappedView:vw ].
 model application:self.
-testModeChannel := model testMode asValue.
-testModeChannel addDependent:self.
 showNamesHolder := false asValue.
 showNamesHolder addDependent:self.
 !
 postBuildTree:aTree
 treeView := aTree scrolledView.
 treeView hasConstantHeight:true.
 ! !
-!ViewTreeApplication methodsFor:'menu actions'!
-doShowNames
-"automatically generated by UIEditor ..."
-"*** the code below performs no action"
-"*** (except for some feedback on the Transcript)"
-"*** Please change as required and accept in the browser."
-"*** (and replace this comment by something more useful ;-)"
-"action to be added ..."
-Transcript showCR:self class name, ': action for #doShowNames ...'.
-! !
 !ViewTreeApplication methodsFor:'menu queries'!
 hasApplication
-"returns true if the current selected view has an application
+"returns true if the current selected view has an application"
-"
 |view|
 view := self selectedView.
 ^ (view notNil and:[view application notNil])
 !
 hasController
 "returns true if the current selected item's view has a controller
-other than nil or the view itself
+other than nil or the view itself"
-"
 |view controller|
 view := self selectedView.
 view notNil ifTrue:[
 ].
 ^ false
 !
 hasModel
-"returns true if the current selected view has a model
+"returns true if the current selected view has a model"
-"
 |view|
 view := self selectedView.
 ^ (view notNil and:[view model notNil])
-!
-hasPickedView
-"returns true if a view is picked
-"
-^ model rootItem notNil
 ! !
 !ViewTreeApplication methodsFor:'menu specs'!
 middleButtonMenu
-"returns the middleButton menu for the single selected item or nil
+"returns the middleButton menu for the single selected item or nil"
-"
 ^ [ model selectedItem notNil ifTrue:[self class middleButtonMenu]
 ifFalse:[nil]
 ]
 !
 ].
 ^ menu
 !
 submenuGeometry:aMenu
-"builds and returns the geometry submenu
+"builds and returns the geometry submenu"
-"
 |view point inst list x y|
 view := self selectedView.
 view isNil ifTrue:[^ nil].
 ^ MenuDesc buildFromList:list onGC:aMenu
 !
 submenuInspector:aMenu
-"builds and returns the inspector submenu
+"builds and returns the inspector submenu"
-"
 |view list n names label value|
 view := self selectedView.
 view isNil ifTrue:[^ nil].
 ^ MenuDesc buildFromList:list onGC:aMenu
 !
 submenuInterface:aMenu
-"builds and returns the interface submenu
+"builds and returns the interface submenu"
-"
 |view label inst value list|
 view := self selectedView.
 view isNil ifTrue:[^ nil].
 list last isSeparator ifTrue:[ list removeLast ].
 ^ MenuDesc buildFromList:list onGC:aMenu
 !
 submenuVisibility:aMenu
-"builds and returns the geometry submenu
+"builds and returns the geometry submenu"
-"
 |view list value|
 view := self selectedView.
 view isNil ifTrue:[^ nil].
 ].
 aRootItemOrNil expand.
 process isNil ifTrue:[
 theProcess := process :=
-Process for:[   |update|
+Process for:[   |update testModeChannel|
 update := false.
+testModeChannel := model testModeChannel.
-[process == theProcess] whileTrue:[
+[process == theProcess] whileTrue:[
 Delay waitForSeconds:0.5.
 (treeView notNil and:[process == theProcess and:[treeView shown]]) ifTrue:[
-(self isInTestmode and:[followFocusChannel value == true]) ifTrue:[
+(testModeChannel value == true and:[followFocusChannel value == true]) ifTrue:[
 self selectFocusView.
 ].
 update ifTrue:[
 self updateShownStatus.
 ].
 treeView invalidateDeviceRectangle:damage repairNow:false.
 ].
 ].
 ! !
-!ViewTreeApplication methodsFor:'queries'!
-isInTestmode
-"returns true if running in test mode - no events eaten
-"
-^ testModeChannel value == true
-! !
 !ViewTreeApplication methodsFor:'selection'!
 selectedView
-"returns the selected view or nil
+"answer the selected view or nil"
-"
 |item|
 item := model selectedItem.
 item notNil ifTrue:[ ^ item widget ].
 ^ nil
 inst class browserClass openInClass:(inst class) selector:nil
 ].
 !
 doDestroy
-"destroy the current selected view
+"destroy the current selected view"
-"
 |item parent|
 item := model selectedItem.
 item isNil ifTrue:[ ^ self].
 model value:nsel.
 ].
 !
 doFlash
-"flash the selected view
+"flash the selected view"
-"
 |view|
 view := self selectedView.
 view isNil ifTrue:[ ^ self].
 inst notNil ifTrue:[ inst inspect ].
 !
 doPickViews
-"pick a window's topView
+"pick a window's topView"
-"
 |window|
 self doUnpick.
 window := Screen current viewFromUser.
 model selectItem:firstFound
 ].
 !
 doUnpick
-"release current picked window and contained subwindows
+"release current picked window and contained subwindows"
-"
 self setRootItem:nil.
 ! !
 !ViewTreeApplication::MenuDesc class methodsFor:'building'!

changeset 2455	93aaf62a6b95
parent 2454	4867f3e9dd43
child 2458	64d8f3c973b3