gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 07:00:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix up lockFocus, restoring graphics context.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4243 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 1999-05-11 15:43:10 +00:00
parent 7b54630f98
commit 115b3cdbf6
12 changed files with 129 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/NSStringDrawing.m
View file

@ -238,8 +238,8 @@ sizeLine(NSAttributedString *str,
*/
// FIXME - superscript should have some effect on height.
below = [font descender];
above = [font pointSize] - below;
below = -([font descender]);
above = [font pointSize];
if (base > 0)
above += base; // Character is above baseline.
else if (base < 0)
@ -484,11 +484,11 @@ drawRun(GSTextRun *run, NSPoint origin, GSDrawInfo *draw)
*/
if (draw->flip)
{
origin.y += run->height - run->baseline;
origin.y += (run->height - run->baseline);
}
else
{
origin.y -= run->height - run->baseline;
origin.y -= (run->height - run->baseline);
}
/*
@ -522,6 +522,14 @@ drawRun(GSTextRun *run, NSPoint origin, GSDrawInfo *draw)
buf[i] = '\0';
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
/* FIXME - Figure out why DGS fails to flush strings and remove this
aweful hack which doesn't even work all the time: */
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
}
else
{
@ -536,6 +544,14 @@ drawRun(GSTextRun *run, NSPoint origin, GSDrawInfo *draw)
DPSshow(draw->ctxt, buf);
origin.x += run->glyphs[i].adv.width;
}
/* FIXME - Figure out why DGS fails to flush strings and remove this
aweful hack which doesn't even work all the time: */
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
DPSmoveto(draw->ctxt, origin.x, origin.y);
DPSshow(draw->ctxt, buf);
}
if (run->underline)
@ -623,8 +639,8 @@ setupRun(GSTextRun *run, unsigned length, unichar *chars, unsigned pos,
* Calculate height of line from font information and base offset.
* FIXME - should include superscript information here.
*/
below = [run->font descender];
above = [run->font pointSize] - below;
below = -([run->font descender]);
above = [run->font pointSize];
if (run->base > 0)
above += run->base; // Character is above baseline.
else if (run->base < 0)
@ -1236,7 +1252,6 @@ setupLine(GSTextLine *line, NSAttributedString *str, NSRange range,
point.y = rect.origin.y + rect.size.height;
[self drawAtPoint: point];
NSRectClip([view bounds]);
}
- (NSSize) size