# HG changeset patch # User Stefan Vogel # Date 1392743646 -3600 # Node ID e4df13b1a9680d74e4c69349e0dd85a1d05f3288 # Parent feb17870467185d8f68fa1104ae816233ce5f130 class: UIObjectView changed:5 methods get device via method call diff -r feb178704671 -r e4df13b1a968 UIObjectView.st --- a/UIObjectView.st Tue Feb 18 18:13:27 2014 +0100 +++ b/UIObjectView.st Tue Feb 18 18:14:06 2014 +0100 @@ -609,10 +609,10 @@ "/ use current point - layout of underlaying view might change "/ and computation dependent on origin is wrong p := self sensor mousePoint. - p := device translatePoint:p fromView:nil toView:self. + p := self graphicsDevice translatePoint:p fromView:nil toView:self. ] ifFalse:[ p := (anEvent x) @ (anEvent y). - p := device translatePoint:p fromView:evView toView:self. + p := self graphicsDevice translatePoint:p fromView:evView toView:self. ]. "/ patch the event @@ -919,7 +919,7 @@ ]. viewOperatedUpon := selectedView. - pView := device translatePoint:aPoint fromView:self toView:selectedView superView. + pView := self graphicsDevice translatePoint:aPoint fromView:self toView:selectedView superView. (selectedView bounds containsPoint:pView) ifFalse:[ "/ clicked outside the selection (self sensor ctrlDown and:[self canChangeLayoutOfView:selectedView]) ifFalse:[ @@ -1458,7 +1458,7 @@ |innerObject relPoint| ((aSubView origin extent:aSubView extent) containsPoint:aPoint) ifTrue:[ - relPoint := device translatePoint:aPoint fromView:aView toView:aSubView. + relPoint := self graphicsDevice translatePoint:aPoint fromView:aView toView:aSubView. innerObject := self findObjectAt:relPoint in:aSubView. innerObject notNil ifTrue:[ ^ innerObject ]. lastHit := aSubView. @@ -1609,7 +1609,7 @@ selectionHiddenLevel == 0 ifTrue:[ self hideSelection. - device flush. + self flush. ]. selectionHiddenLevel := selectionHiddenLevel + 1. @@ -1803,7 +1803,7 @@ self clippedByChildren:(clipChildren := oldClipped). ]. - device flush. + self flush. savedSelection := selection. [