Author: rmottola
Date: Sat Mar 12 23:48:24 2016
New Revision: 39533
URL: http://svn.gna.org/viewcvs/gnustep?rev=39533&view=rev
Log:
fix warning
Modified:
libs/gui/trunk/Source/GSHorizontalTypesetter.m
libs/gui/trunk/Source/NSToolbar.m
Modified: libs/gui/trunk/Source/GSHorizontalTypesetter.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/GSHorizontalTypesetter.m?rev=39533&r1=39532&r2=39533&view=diff
==============================================================================
--- libs/gui/trunk/Source/GSHorizontalTypesetter.m (original)
+++ libs/gui/trunk/Source/GSHorizontalTypesetter.m Sat Mar 12 23:48:24 2016
@@ -912,8 +912,24 @@
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 @@
/* 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;
Modified: libs/gui/trunk/Source/NSToolbar.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSToolbar.m?rev=39533&r1=39532&r2=39533&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSToolbar.m (original)
+++ libs/gui/trunk/Source/NSToolbar.m Sat Mar 12 23:48:24 2016
@@ -423,7 +423,7 @@
{
GSValidationObject *vobj;
NSMutableArray *observersWindow;
- NSMutableArray *windows;
+ NSArray *windows;
NSEnumerator *e;
NSWindow *w;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
