hg/stx-libtool2: comparison UISelectionPanel.st

equal deleted inserted replaced

-:ae84facd80be
+:060fc1ac8d82
 "
 <resource: #canvas>
 ^
 #(#FullSpec
 #'window:'
 #(#WindowSpec
 #'name:' 'uIPainterView'
 #'layout:' #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
 #(
 #(#ArrowButtonSpec
 #'name:' 'ArrowButton up'
 #'layout:' #(#LayoutFrame 237 0 20 0 259 0 42 0)
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'direction:' #up
 )
 #(#ActionButtonSpec
 #'name:' 'Button'
 #'layout:' #(#LayoutFrame 20 0 20 0 119 0 42 0)
 #'label:' 'Button'
 #'isTriggerOnDown:' false
+#'autoRepeat:' false
 )
 #(#RadioButtonSpec
 #'name:' 'RadioButton'
 #'layout:' #(#LayoutFrame 127 0.0 20 0 226 0 42 0)
 #'label:' 'RadioButton'
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'showLamp:' true
 #'lampColor:' #(#Color 100.0 100.0 0.0)
 )
 #(#ArrowButtonSpec
 #'name:' 'ArrowButton down'
 #'layout:' #(#LayoutFrame 238 0 51 0 260 0 73 0)
 #'hasCharacterOrientedLabel:' false
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'direction:' #down
 )
 #(#ArrowButtonSpec
 #'name:' 'ArrowButton left'
 #'layout:' #(#LayoutFrame 238 0 82 0 260 0 104 0)
 #'hasCharacterOrientedLabel:' false
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'direction:' #left
 )
 #(#ArrowButtonSpec
 #'name:' 'ArrowButton right'
 #'layout:' #(#LayoutFrame 238 0 113 0 260 0 135 0)
 #'hasCharacterOrientedLabel:' false
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'direction:' #right
 )
 #(#CheckToggleSpec
 #'name:' 'CheckToggle'
 #'layout:' #(#LayoutFrame 297 0 82 0 317 0 102 0)
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'showLamp:' false
 #'lampColor:' #(#Color 100.0 100.0 0.0)
 )
 #(#ToggleSpec
 #'name:' 'Toggle'
 #'layout:' #(#LayoutFrame 297 0 20 0 396 0 42 0)
 #'label:' 'Toggle'
 #'isTriggerOnDown:' true
+#'autoRepeat:' false
 #'showLamp:' true
 #'lampColor:' #(#Color 100.0 100.0 0.0)
 )
 #(#CheckBoxSpec
 #'name:' 'CheckBox'
-#'layout:' #(#LayoutFrame 295 0 51 0 396 0 73 0)
+#'layout:' #(#LayoutFrame 297 0 51 0 398 0 73 0)
-#'tabable:' false
 #'label:' 'CheckBox'
-#'translateLabel:' false
 )
 #(#ActionButtonSpec
 #'name:' 'ok'
 #'layout:' #(#LayoutFrame 20 0 51 0 119 0 73 0)
 #'label:' 'ok'
 #'model:' #accept
 #'isTriggerOnDown:' false
+#'autoRepeat:' false
 )
 #(#ActionButtonSpec
 #'name:' 'cancel'
 #'layout:' #(#LayoutFrame 20 0 82 0 119 0 104 0)
 #'label:' 'cancel'
 #'model:' #cancel
 #'isTriggerOnDown:' false
+#'autoRepeat:' false
 )
 #(#ActionButtonSpec
 #'name:' 'help'
 #'layout:' #(#LayoutFrame 20 0 113 0 119 0 135 0)
 #'label:' 'help'
 #'model:' #help
 #'isTriggerOnDown:' false
+#'autoRepeat:' false
 )
 )
 )
 )
 !
 menuComboSpec
 "this window spec was automatically generated by the ST/X UIPainter"
 #(#SpecCollection
 #'collection:'
 #(
 #(#ComboBoxSpec
 #'name:' 'ComboBox'
-#'layout:' #(#LayoutFrame 20 0 20 0 123 0 40 0)
+#'layout:' #(#LayoutFrame 20 0 14 0 123 0 34 0)
-#'immediateAccept:' true
 )
 #(#ComboListSpec
 #'name:' 'ComboList'
-#'layout:' #(#LayoutFrame 20 0 51 0 123 0 71 0)
+#'layout:' #(#LayoutFrame 20 0 71 0 123 0 91 0)
-#'tabable:' false
+#'useIndex:' false
 )
 #(#PopUpListSpec
 #'name:' 'PopUpList'
-#'layout:' #(#LayoutFrame 147 0 20 0 250 0 42 0)
+#'layout:' #(#LayoutFrame 147 0 14 0 250 0 36 0)
 #'label:' 'PopUpList'
+#'useIndex:' false
 )
 #(#MenuPanelSpec
 #'name:' 'MenuPanel'
-#'layout:' #(#LayoutFrame 147 0 67 0 250 0 89 0)
+#'layout:' #(#LayoutFrame 147 0 71 0 250 0 91 0)
 )
 #(#TabViewSpec
 #'name:' 'TabView'
-#'layout:' #(#LayoutFrame 269 0 20 0 409 0 56 0)
+#'layout:' #(#LayoutFrame 269 0 14 0 409 0 50 0)
 #'tabWidget:' #Window
-#'direction:' #top
 )
 #(#NoteBookViewSpec
 #'name:' 'noteBookView'
-#'layout:' #(#LayoutFrame 269 0 66 0 409 0 182 0)
+#'layout:' #(#LayoutFrame 269 0 71 0 409 0 159 0)
-#'level:' 2
+#'tabWidget:' #Window
 )
 #(#LabelSpec
 #'name:' 'label1'
-#'layout:' #(#LayoutFrame 147 0 51 0 250 0 67 0)
+#'layout:' #(#LayoutFrame 150 0 73 0 236 0 89 0)
 #'label:' 'MenuPanel'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 )
 )
 )
 #'layout:' #(#LayoutFrame 222 0 109 0 401 0 131 0)
 )
 #(#LabelSpec
 #'name:' 'Text Label'
 #'layout:' #(#LayoutFrame 222 0 138 0 401 0 160 0)
-#'label:' 'Text Label'
+#'label:' ''
 )
 #(#TextEditorSpec
 #'name:' 'EditTextView'
 #'layout:' #(#LayoutFrame 20 0 13 0 199 0 101 0)
 #'hasHorizontalScrollBar:' true
 #'hasHorizontalScrollBar:' true
 #'hasVerticalScrollBar:' true
 )
 #(#LabelSpec
 #'name:' 'HTMLViewLabel'
-#'layout:' #(#LayoutFrame 99 0 178 0 164 0 192 0)
+#'layout:' #(#LayoutFrame 93 0 179 0 158 0 193 0)
 #'label:' 'HTMLView'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 #(#LabelSpec
 #'name:' 'label1'
-#'layout:' #(#LayoutFrame 91 0 83 0 153 0 97 0)
+#'layout:' #(#LayoutFrame 93 0 83 0 155 0 97 0)
 #'label:' 'EditText'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 #(#LabelSpec
 #'name:' 'label2'
-#'layout:' #(#LayoutFrame 297 0 83 0 384 0 97 0)
+#'layout:' #(#LayoutFrame 295 0 83 0 382 0 97 0)
 #'label:' 'SelectionInList'
+#'adjust:' #left
+#'canUIDrag:' false
+)
+#(#LabelSpec
+#'name:' 'labelInLabel'
+#'layout:' #(#LayoutFrame 226 0 142 0 260 0 156 0)
+#'label:' 'Label'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 )
 )
 )
 #'hasHorizontalScrollBar:' true
 #'hasVerticalScrollBar:' true
 )
 #(#LabelSpec
 #'name:' 'subCanvasLabel'
-#'layout:' #(#LayoutFrame 272 0 85 0 343 0 102 0)
+#'layout:' #(#LayoutFrame 272 0 86 0 343 0 100 0)
 #'label:' 'SubCanvas'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 #(#DividerSpec
 #'name:' 'Horizontal Seperator'
 #'layout:' #(#LayoutFrame 199 0 116 0 360 0 120 0)
 #'layout:' #(#LayoutFrame 356 0 116 0 360 0 188 0)
 #'orientation:' #vertical
 )
 #(#LabelSpec
 #'name:' 'viewLabel'
-#'layout:' #(#LayoutFrame 14 0 116 0 65 0 133 0)
+#'layout:' #(#LayoutFrame 19 0 118 0 70 0 135 0)
 #'label:' 'View'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 #(#LabelSpec
 #'name:' 'Seperators'
-#'layout:' #(#LayoutFrame 199 0 133 0 270 0 151 0)
+#'layout:' #(#LayoutFrame 199 0 125 0 270 0 143 0)
 #'label:' 'Seperators'
+#'adjust:' #left
 #'canUIDrag:' false
 )
 )
 )
 )
 selection
 ^ selection
 !
 selection:aValue
-|spec|
+|spec canvas|
 (aValue isNil or:[aValue == 0]) ifTrue:[
 ^ self
 ].
 selection ~~ aValue ifTrue:[
 (selection := aValue) notNil ifTrue:[
 selectors size >= aValue ifTrue:[
 spec := receiver perform:(selectors at:selection)
 ]
 ].
-(builder aspectAt:#canvas) specification:spec
+canvas := builder aspectAt:#canvas.
+canvas specification:spec.
 ].
 ! !
 !UISelectionPanel::Canvas methodsFor:'accessing'!
 aSpecOrSpecArray notNil ifTrue:[
 specification := UISpecification from:aSpecOrSpecArray.
 builder := UIBuilder new.
 specification buildViewFor:builder in:self.
+subViews do:[:v|
+(v ~~ inputView and:[(self findSpecFor:v) notNil]) ifTrue:[
+v borderWidth:1.
+]
+].
 self realizeAllSubViews.
 inputView raise.
 ] ifFalse:[
 specification := nil
 ]
 !UISelectionPanel::Canvas methodsFor:'searching'!
 findObjectAtX:x y:y
 "find the origin/corner of the currentWidget
 "
-|view viewId point|
+|point id p e|
-point   := Point x:x y:y.
+point := Point x:x y:y.
-point   := device translatePoint:point from:(inputView id)
+id    := inputView id.
-to:(inputView device rootView id).
-inputView lower.
+subViews do:[:v|
-viewId := device viewIdFromPoint:point in:(self id).
+v ~~ inputView ifTrue:[
-view   := device viewFromId:viewId.
+p := device translatePoint:point from:id to:(v id).
-inputView raise.
+(     p x >= 0 and:[p x <= v width
+and:[p y >= 0 and:[p y <= v height
-(view ~~ self and:[view ~~ inputView]) ifTrue:[
+and:[(self findSpecFor:v) notNil]]]]
-(self findSpecFor:view) notNil ifTrue:[
+) ifTrue:[
-^ view
+^ v
+]
 ]
 ].
 ^ nil
 !
 !UISelectionPanel::Canvas::DropSpecification class methodsFor:'instance creation'!
 for:aView specification:aSpec
 "create drop object for a view derived from a specification
 "
-aView topView raise.
+|point extent root device|
-aView device sync.
-aView invalidate.
+device := aView device.
-aView windowGroup processExposeEvents.
+root   := device rootView.
-DisplayObject := Image fromView:aView grab:false.
+extent := aView extent.
+point  := device translatePoint:0@0 from:(aView id) to:(root id).
-DisplayObject extent ~= aView extent ifTrue:[
-DisplayObject := Form extent:(aView extent) depth:1.
+DisplayObject := nil.
+(point x > 0 and:[point y > 0]) ifTrue:[
+point := point + extent.
+(point x < root width and:[point y < root height]) ifTrue:[
+aView topView raise.
+device sync.
+aView invalidate.
+aView windowGroup processExposeEvents.
+DisplayObject := Image fromView:aView grab:false.
+]
+].
+DisplayObject isNil ifTrue:[
+DisplayObject := Form extent:extent depth:1.
 DisplayObject colorMap:(Array with:Color white with:Color black).
 DisplayObject fill:(Color colorId:0).
 DisplayObject paint:(Color colorId:1).
 DisplayObject displayRectangleX:0 y:0 width:aView extent x height:aView extent y.
 ].
+^ self new theObject:aSpec
-^ self new theObject:aSpec
 ! !
 !UISelectionPanel class methodsFor:'documentation'!

changeset 147	060fc1ac8d82
parent 143	9add9e2609d9
child 150	9f88bc99e0af