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

fix warning

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39533 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2016-03-12 22:48:24 +00:00
parent 93018cffb2
commit e0fedc5692
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/GSHorizontalTypesetter.m
View file

@ -912,8 +912,24 @@ restart: ;
if (y > 0 && f_descender + y > descender)
descender = f_descender + y;
COMPUTE_BASELINE;
WANT_LINE_HEIGHT(ascender + descender);
baseline = line_height - descender;
if ((max_line_height > 0 && (ascender + descender) > max_line_height) )
{
if (max_line_height > line_height)
{
NSLog(@"line 920, %f", max_line_height);
line_height = max_line_height;
baseline = max_line_height - descender;
goto restart;
}
}
else if ((ascender + descender) > line_height)
{
NSLog(@"line 9258 mlh %f, a+s %f, lh %f, diff %f", max_line_height, ascender + descender, line_height, line_height - (ascender + descender));
line_height = ascender + descender;
baseline = ascender;
goto restart;
}
}
if (g->g == GSAttachmentGlyph)
@ -963,7 +979,7 @@ restart: ;
/* Update ascender and descender. Adjust line height and
baseline if necessary. */
COMPUTE_BASELINE;
baseline = line_height - descender;
WANT_LINE_HEIGHT(ascender + descender);
g->size = r.size;

2
Source/NSToolbar.m
View file

@ -423,7 +423,7 @@ static GSValidationCenter *vc = nil;
{
GSValidationObject *vobj;
NSMutableArray *observersWindow;
NSMutableArray *windows;
NSArray *windows;
NSEnumerator *e;
NSWindow *w;