gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-29 20:17:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the soft-invalidated layout information to avoid rebuilding layout (when possible).

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16004 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-02-18 20:27:13 +00:00
parent 5f2fd0477a
commit f4a797f333
1 changed files with 54 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Source/GSHorizontalTypesetter.m
View file

@ -386,6 +386,60 @@ typedef struct GSHorizontalTypesetter_line_frag_s
#define COMPUTE_BASELINE baseline = line_height - descender
/* TODO: doesn't have to be a simple horizontal container, but it's easier
to handle that way. */
if ([curTextContainer isSimpleRectangularTextContainer] &&
[curLayoutManager _softInvalidateFirstGlyphInTextContainer: curTextContainer] == curGlyph)
{
/*
We only handle the simple-horizontal-text-container case currently.
*/
NSRect r0, r;
NSSize shift;
int i;
unsigned int g, g2;
float container_height;
/*
Ask the layout manager for soft-invalidated layout for the current
glyph. If there is a set of line frags starting at the current glyph,
and we can get rects with the same size and horizontal position, we
tell the layout manager to use the soft-invalidated information.
*/
r0 = [curLayoutManager _softInvalidateLineFragRect: 0
nextGlyph: &g
inTextContainer: curTextContainer];
container_height = [curTextContainer containerSize].height;
if (curPoint.y + r0.size.height <= container_height)
{
/*
We can shift the rects and still have things fit. Find all the line
frags in the line and shift them.
*/
shift.width = 0;
shift.height = curPoint.y - r0.origin.y;
for (i = 1; 1; i++)
{
r = [curLayoutManager _softInvalidateLineFragRect: i
nextGlyph: &g2
inTextContainer: curTextContainer];
if (NSEqualRects(r, NSZeroRect) || NSMaxY(r) + shift.height > container_height)
break;
g = g2;
}
[curLayoutManager _softInvalidateUseLineFrags: i
withShift: shift
inTextContainer: curTextContainer];
curGlyph = g;
curPoint.y = NSMaxY(r);
return 0;
}
}
[self _cacheMoveTo: curGlyph];
if (!cache_length)
[self _cacheGlyphs: 16];
@ -1081,7 +1135,6 @@ NS_DURING
*nextGlyphIndex = curGlyph;
NS_HANDLER
[lock unlock];
// printf("got exception %@\n",localException);
[localException raise];
NS_ENDHANDLER
[lock unlock];