diff -r 1ddfc032a8c5 -r bbb356d49430 XftFontDescription.st --- a/XftFontDescription.st Mon Mar 24 20:18:28 2014 +0100 +++ b/XftFontDescription.st Mon Mar 24 20:22:49 2014 +0100 @@ -450,14 +450,6 @@ bytesPerCharacter := aString bitsPerCharacter // 8. transformation := aGC transformation. - transformation isNil ifTrue:[ - drawX := xArg. - drawY := yArg. - ] ifFalse:[ - drawX := transformation applyToX: xArg. - drawY := transformation applyToY: yArg. - ]. - clipR := aGC clippingBoundsOrNil. clipR notNil ifTrue:[ clipX := clipR left. @@ -466,6 +458,20 @@ clipH := clipR height. ]. + transformation isNil ifTrue:[ + drawX := xArg. + drawY := yArg. + ] ifFalse:[ + drawX := transformation applyToX:xArg. + drawY := transformation applyToY:yArg. + clipR notNil ifTrue:[ + clipX := transformation applyToX:clipX. + clipY := transformation applyToY:clipY. + clipW := transformation applyScaleX:clipW. + clipH := transformation applyScaleY:clipH. + ]. + ]. + fg := aGC paint. fgPixel := fg colorId. "/ fgPixel notNil ifTrue:[ @@ -1914,11 +1920,11 @@ !XftFontDescription class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.42 2014-03-20 22:56:49 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.43 2014-03-24 19:22:49 stefan Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.42 2014-03-20 22:56:49 stefan Exp $' + ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.43 2014-03-24 19:22:49 stefan Exp $' ! !