--- a/UIGalleryView.st Wed Nov 28 13:14:41 2007 +0100
+++ b/UIGalleryView.st Fri Nov 30 16:50:35 2007 +0100
@@ -458,26 +458,28 @@
evView := anEvent view.
evView isNil ifTrue:[ ^ false ].
+ (anEvent isButtonPressEvent or:[anEvent isButtonReleaseEvent])ifTrue:[
+ lastClickPoint := nil.
+ ].
evView == self ifFalse:[
(evView isComponentOf:self) ifFalse:[ ^ false ].
].
anEvent isButtonEvent ifFalse:[
anEvent isInputEvent ifTrue:[^ true].
+
anEvent isDamage ifTrue:[ self redrawSelection ].
^ false
].
- anEvent isButtonReleaseEvent ifTrue:[
- lastClickPoint := nil.
- ^ true
- ].
+ anEvent isButtonReleaseEvent ifTrue:[ ^ true ].
anEvent isButtonMotionEvent ifTrue:[
(lastClickPoint notNil and:[anEvent state ~~ 0]) ifTrue:[
p := Point x:(anEvent x) y:(anEvent y).
+ p := device translatePoint:p fromView:evView toView:self.
- (lastClickPoint dist:p) > 10.0 ifTrue:[
+ (lastClickPoint dist:p) > 20.0 ifTrue:[
self startDragFrom:evView.
lastClickPoint := nil.
]
@@ -487,7 +489,6 @@
anEvent isButtonPressEvent ifTrue:[ |button application|
button := anEvent button.
- lastClickPoint := nil.
(button == 1 or:[button == #select]) ifTrue:[
p := Point x:(anEvent x) y:(anEvent y).
@@ -496,7 +497,7 @@
self selection:(self findObjectAt:p).
selection notNil ifTrue:[
- lastClickPoint := p
+ lastClickPoint := p.
]
] ifFalse:[
(menuSelector notNil and:[(application := self application) notNil]) ifTrue:[
@@ -511,6 +512,14 @@
^ true
! !
+!UIGalleryView::Canvas methodsFor:'focus handling'!
+
+subviewsInFocusOrder
+ "returns none views - focus not handled within buildin canvas"
+
+ ^ #()
+! !
+
!UIGalleryView::Canvas methodsFor:'initialization'!
destroy