--- a/SimpleView.st Mon Feb 03 11:35:50 2014 +0100
+++ b/SimpleView.st Mon Feb 03 11:36:15 2014 +0100
@@ -3897,7 +3897,7 @@
]
!
-clippingRectangle:aRectangle
+clippingBounds:aRectangle
"set the clipping rectangle for drawing (in logical coordinates);
a nil argument turns off clipping (i.e. whole view is drawable).
Redefined to care for any margin."
@@ -3905,55 +3905,55 @@
|x y w h|
aRectangle isNil ifTrue:[
- clipRect isNil ifTrue:[^ self].
- gcId notNil ifTrue:[
- device noClipIn:drawableId gc:gcId
- ]
+ clipRect isNil ifTrue:[^ self].
+ gcId notNil ifTrue:[
+ device noClipIn:drawableId gc:gcId
+ ]
] ifFalse:[
- clipRect notNil ifTrue:[
- (clipRect = aRectangle) ifTrue:[^ self]
- ].
- gcId notNil ifTrue:[
- x := aRectangle left.
- y := aRectangle top.
- w := aRectangle width.
- h := aRectangle height.
- transformation notNil ifTrue:[
- x := transformation applyToX:x.
- y := transformation applyToY:y.
- w := transformation applyScaleX:w.
- h := transformation applyScaleY:h.
- ].
- (x isMemberOf:SmallInteger) ifFalse:[
- w := w + (x - x truncated).
- x := x truncated
- ].
- (y isMemberOf:SmallInteger) ifFalse:[
- h := h + (y - y truncated).
- y := y truncated
- ].
- (w isMemberOf:SmallInteger) ifFalse:[
- w := w truncated + 1
- ].
- (h isMemberOf:SmallInteger) ifFalse:[
- h := h truncated + 1
- ].
- x < margin ifTrue:[
- x := margin.
- ].
- y < margin ifTrue:[
- y := margin.
- ].
- x + w - 1 >= (width-margin) ifTrue:[
- w := width - margin - x
- ].
- y + h - 1 >= (height-margin) ifTrue:[
- h := height - margin - y
- ].
- w := w max:0.
- h := h max:0.
- device setClipX:x y:y width:w height:h in:drawableId gc:gcId
- ]
+ clipRect notNil ifTrue:[
+ (clipRect = aRectangle) ifTrue:[^ self]
+ ].
+ gcId notNil ifTrue:[
+ x := aRectangle left.
+ y := aRectangle top.
+ w := aRectangle width.
+ h := aRectangle height.
+ transformation notNil ifTrue:[
+ x := transformation applyToX:x.
+ y := transformation applyToY:y.
+ w := transformation applyScaleX:w.
+ h := transformation applyScaleY:h.
+ ].
+ (x isMemberOf:SmallInteger) ifFalse:[
+ w := w + (x - x truncated).
+ x := x truncated
+ ].
+ (y isMemberOf:SmallInteger) ifFalse:[
+ h := h + (y - y truncated).
+ y := y truncated
+ ].
+ (w isMemberOf:SmallInteger) ifFalse:[
+ w := w truncated + 1
+ ].
+ (h isMemberOf:SmallInteger) ifFalse:[
+ h := h truncated + 1
+ ].
+ x < margin ifTrue:[
+ x := margin.
+ ].
+ y < margin ifTrue:[
+ y := margin.
+ ].
+ x + w - 1 >= (width-margin) ifTrue:[
+ w := width - margin - x
+ ].
+ y + h - 1 >= (height-margin) ifTrue:[
+ h := height - margin - y
+ ].
+ w := w max:0.
+ h := h max:0.
+ device setClipX:x y:y width:w height:h in:drawableId gc:gcId
+ ]
].
clipRect := aRectangle
@@ -11174,11 +11174,11 @@
!SimpleView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.737 2013-11-08 16:26:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.738 2014-02-03 10:36:15 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.737 2013-11-08 16:26:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.738 2014-02-03 10:36:15 stefan Exp $'
!
version_SVN