Author: mlytwyn
Date: Fri Jun 26 17:34:29 2015
New Revision: 38698
URL: http://svn.gna.org/viewcvs/gnustep?rev=38698&view=rev
Log:
Gorm and GSHorizontalTypesetter merges
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSGormLoading.m
libs/gui/branches/gnustep_testplant_branch/Source/GSHorizontalTypesetter.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSGormLoading.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSGormLoading.m?rev=38698&r1=38697&r2=38698&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSGormLoading.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSGormLoading.m Fri Jun
26 17:34:29 2015
@@ -892,7 +892,7 @@
// decode the defer flag...
[coder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
_autoPositionMask = GSWindowAutoPositionNone;
- _screenRect = [[_object screen] frame];
+ _screenRect = [[obj screen] frame];
}
// FIXME: The designated initializer logic for NSWindow is in the
initWithCoder: method of
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSHorizontalTypesetter.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSHorizontalTypesetter.m?rev=38698&r1=38697&r2=38698&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSHorizontalTypesetter.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSHorizontalTypesetter.m
Fri Jun 26 17:34:29 2015
@@ -607,8 +607,15 @@
max_line_height = [curParagraphStyle maximumLineHeight];
/* sanity */
+#if 0
+ // Testplant-MAL-2015-06-26: Merge with main branch...
+ // This doesn't work in eggplant test...
+ if (max_line_height > 0 && max_line_height < min)
+#else
+ // Testplant-MAL-2015-06-26: Original testplant code...
if (max_line_height < min)
max_line_height = min;
+#endif
line_height = [cache->font defaultLineHeightForFont];
ascender = [cache->font ascender];
@@ -968,7 +975,15 @@
g->size = r.size;
g->pos.x = p.x + r.origin.x;
+#if 0
+ // Testplant-MAL-2015-06-26: Merge with main branch...
+ g->pos.y = p.y - r.origin.y;
+#else
+ // Testplant-MAL-2015-06-26: Original testplant code...
+ // Using this over main branch...the above line with '-'
+ // doesn't seem to position text correctly in a text box...
g->pos.y = p.y + r.origin.y;
+#endif
p.x = g->pos.x + g->size.width;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
