Author: fredkiefer
Date: Tue Aug 2 22:48:01 2016
New Revision: 40047
URL: http://svn.gna.org/viewcvs/gnustep?rev=40047&view=rev
Log:
Small opal changes.
Modified:
libs/back/trunk/ChangeLog
libs/back/trunk/Source/opal/OpalFontInfo.m
libs/back/trunk/Source/opal/OpalGState.m
libs/back/trunk/Source/opal/OpalSurface.m
Modified: libs/back/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/ChangeLog?rev=40047&r1=40046&r2=40047&view=diff
==============================================================================
--- libs/back/trunk/ChangeLog (original)
+++ libs/back/trunk/ChangeLog Tue Aug 2 22:48:01 2016
@@ -1,3 +1,12 @@
+2016-08-02 Fred Kiefer <[email protected]>
+
+ * Source/opal/OpalFontInfo.m
+ Correct the calculation of line height.
+ * Source/opal/OpalGState.m
+ Adjust font placement to changed height.
+ * Source/opal/OpalSurface.m
+ Better debug output.
+
2016-07-15 Fred Kiefer <[email protected]>
* Source/gsc/GSStreamContext.m:
Modified: libs/back/trunk/Source/opal/OpalFontInfo.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/opal/OpalFontInfo.m?rev=40047&r1=40046&r2=40047&view=diff
==============================================================================
--- libs/back/trunk/Source/opal/OpalFontInfo.m (original)
+++ libs/back/trunk/Source/opal/OpalFontInfo.m Tue Aug 2 22:48:01 2016
@@ -108,7 +108,7 @@
// lineHeight = font_extents.height
// alternatively: line spacing = (ascent + descent + "external leading")
// (internal discussion between ivucica and ericwa, 2013-09-17)
- lineHeight = leading + ascender - descender;
+ lineHeight = leading + ascender + descender;
#if 0
// Get default font options
Modified: libs/back/trunk/Source/opal/OpalGState.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/opal/OpalGState.m?rev=40047&r1=40046&r2=40047&view=diff
==============================================================================
--- libs/back/trunk/Source/opal/OpalGState.m (original)
+++ libs/back/trunk/Source/opal/OpalGState.m Tue Aug 2 22:48:01 2016
@@ -209,8 +209,8 @@
}
CGPoint pt = CGContextGetPathCurrentPoint(cgctx);
- // FIXME: why * 0.66?
- pt.y += [self->font defaultLineHeightForFont] * 0.66;
+ // FIXME: why?
+ pt.y += [self->font defaultLineHeightForFont] * 0.5;
CGContextSetTextPosition(cgctx, pt.x, pt.y);
CGContextShowGlyphsWithAdvances(cgctx, cgglyphs, (const CGSize
*)advances,
length);
@@ -239,14 +239,6 @@
{
NSDebugLLog(@"OpalGState", @"%p (%@): %s", self, [self class],
__PRETTY_FUNCTION__);
- if (!pat && size != 0)
- {
- NSLog(@"%s: null 'pat' passed with size %d. Fixing by setting size to
0.", pat, (int)size);
- size = 0;
- // TODO: looking at opal, it does not seem to have a tolerance for
- // pat=NULL although CGContextSetLineDash() explicitly specifies that
- // as a possible argument
- }
CGContextRef cgctx = CGCTX;
if (cgctx)
Modified: libs/back/trunk/Source/opal/OpalSurface.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/trunk/Source/opal/OpalSurface.m?rev=40047&r1=40046&r2=40047&view=diff
==============================================================================
--- libs/back/trunk/Source/opal/OpalSurface.m (original)
+++ libs/back/trunk/Source/opal/OpalSurface.m Tue Aug 2 22:48:01 2016
@@ -109,7 +109,8 @@
_gsWindowDevice->buffer_height);
}
- NSDebugLLog(@"OpalSurface", @"Created CGContexts: X11=%p, backing=%p",
_x11CGContext, _backingCGContext);
+ NSDebugLLog(@"OpalSurface", @"Created CGContexts: X11=%p, backing=%p,
width=%d height=%d",
+ _x11CGContext, _backingCGContext, _gsWindowDevice->buffer_width,
_gsWindowDevice->buffer_height);
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
