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

Gorm and GSHorizontalTypesetter merges

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38698 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-26 15:34:29 +00:00
parent 9a550a23e5
commit dc754ea0a5
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/GSGormLoading.m
View file

@ -892,7 +892,7 @@ static NSString *GSInternalNibItemAddedNotification = @"_GSInternalNibItemAddedN
// 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

15
Source/GSHorizontalTypesetter.m
View file

@ -607,8 +607,15 @@ Return values 0, 1, 2 are mostly the same as from
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 @@ restart: ;
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;