gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

(-layoutLineNewParagraph:): Fix sign problem with descender.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15843 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-02-01 12:54:09 +00:00
parent b6468a8ffa
commit 2169264f00
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-02-01 13:52 Alexander Malmberg <alexander@malmberg.org>
* Source/GSHorizontalTypesetter.m (-layoutLineNewParagraph:): Fix
sign problem with descender.
Sat Feb 1 05:34:09 2003 Benhur Stein <benhur@inf.ufsm.br>,
Nicola Pero <n.pero@mi.flashnet.it>

21
Source/GSHorizontalTypesetter.m
View file

@ -392,7 +392,7 @@ typedef struct
line_height = [cache->font defaultLineHeightForFont];
ascender = [cache->font ascender];
descender = [cache->font descender];
descender = -[cache->font descender];
#define COMPUTE_BASELINE baseline = ascender
@ -491,7 +491,7 @@ restart:
NSPoint p;
NSFont *f = cache->font;
float f_ascender = [f ascender], f_descender = [f descender];
float f_ascender = [f ascender], f_descender = -[f descender];
NSGlyph last_glyph = NSNullGlyph;
NSPoint last_p;
@ -557,20 +557,18 @@ restart:
(TODO?) */
if (g->font != f)
{
float new_height, new_ascender, new_descender;
float new_height;
f = g->font;
f_ascender = [f ascender];
f_descender = [f descender];
f_descender = -[f descender];
last_glyph = NSNullGlyph;
new_height = [f defaultLineHeightForFont];
new_ascender = [f ascender];
new_descender = [f descender];
if (new_ascender > ascender)
ascender = new_ascender;
if (new_descender > descender)
descender = new_descender;
if (f_ascender > ascender)
ascender = f_ascender;
if (f_descender > descender)
descender = f_descender;
COMPUTE_BASELINE;
@ -627,7 +625,8 @@ restart:
}
if (g->attributes.baseline_offset)
{
y -= g->attributes.baseline_offset;
/* And baseline_offset is up-side-down again. TODO? */
y += g->attributes.baseline_offset;
}
if (y != p.y)