diff -r 5ebb8e1617fe -r 8955b81883e6 XftFontDescription.st --- a/XftFontDescription.st Tue Jun 03 11:35:13 2014 +0200 +++ b/XftFontDescription.st Tue Jun 03 11:43:46 2014 +0200 @@ -76,7 +76,8 @@ # define __HANDLE_VAL(type, externalAddress) \ ((type)__externalAddressVal(externalAddress)) -#define __HANDLE_NEW(ptr, __cls) \ + +# define __HANDLE_NEW(ptr, __cls) \ ({ \ OBJ handle; \ handle = __MKEXTERNALADDRESS(ptr); \ @@ -546,13 +547,17 @@ bytesPerCharacter := aString bitsPerCharacter // 8. transformation := aGC transformation. -"/ clipR := aGC clippingBoundsOrNil. -"/ clipR notNil ifTrue:[ -"/ clipX := clipR left. -"/ clipY := clipR top. -"/ clipW := clipR width. -"/ clipH := clipR height. -"/ ]. + clipR := aGC clippingBoundsOrNil. + clipR notNil ifTrue:[ + clipX := clipR left. + clipY := clipR top. + clipW := clipR width. + clipH := clipR height. + transformation notNil ifTrue:[ + clipX := (transformation applyToX:clipX) ceiling. + clipY := (transformation applyToY:clipY) ceiling. + ]. + ]. transformation isNil ifTrue:[ drawX := xArg. @@ -2030,11 +2035,11 @@ !XftFontDescription class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.53 2014-06-03 09:35:13 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.54 2014-06-03 09:43:46 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.53 2014-06-03 09:35:13 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/XftFontDescription.st,v 1.54 2014-06-03 09:43:46 cg Exp $' ! !