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

Don't track the started status for a text container separately. Use num_linefrags instead.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16048 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-02-23 01:01:13 +00:00
parent 5be49b8ab4
commit 735e3bed5e
4 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/NSLayoutManager.m
View file

@ -1666,7 +1666,7 @@ TODO: not really clear what these should do
for (i = 0; i < num_textcontainers; i++)
{
if (!textcontainers[i].started)
if (!textcontainers[i].num_linefrags)
break;
if (textcontainers[i].pos >= aRange.location + aRange.length)
@ -1742,7 +1742,8 @@ TODO: not really clear what these should do
for (i = 0, tc = textcontainers; i < num_textcontainers; i++, tc++)
{
printf("tc %2i, %5i+%5i\n",i,tc->pos,tc->length);
printf("tc %2i, %5i+%5i (complete %i)\n",
i,tc->pos,tc->length,tc->complete);
printf(" lfs: (%3i)\n", tc->num_linefrags);
for (j = 0, lf = tc->linefrags; j < tc->num_linefrags; j++, lf++)
{
@ -1768,6 +1769,7 @@ TODO: not really clear what these should do
printf(" a%3i : %5i+%5i\n",k,la->pos,la->length);
}
}
printf("layout to: char %i, glyph %i\n",layout_char,layout_glyph);
}
@ -1953,7 +1955,6 @@ this file describes this.
else
{
tc->pos = tc->length = 0;
tc->started = NO;
}
j++, tc++;
@ -1985,12 +1986,11 @@ this file describes this.
tc->complete = NO;
if (new_num)
{
tc->length = tc->linefrags[new_num-1].pos + tc->linefrags[new_num-1].length - tc->pos;
tc->length = tc->linefrags[new_num - 1].pos + tc->linefrags[new_num - 1].length - tc->pos;
}
else
{
tc->pos = tc->length = 0;
tc->started = NO;
}
/*
@ -2019,7 +2019,7 @@ no_soft_invalidation:
/* Set layout_glyph and layout_char. */
for (i = num_textcontainers - 1, tc = textcontainers + i; i >= 0; i--, tc--)
{
if (tc->started)
if (tc->num_linefrags)
{
layout_glyph = tc->pos + tc->length;
if (layout_glyph == glyphs->glyph_length)