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

Fix an edge case in tab handling. Also, if tabs occure and the paragraph style has no more tab stops, act as if there were tabs every 100 points.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@15957 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-02-14 16:59:38 +00:00
parent 85ff161e72
commit 6d1c78032a
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Source/GSHorizontalTypesetter.m
View file

@ -26,7 +26,7 @@
#include "AppKit/GSHorizontalTypesetter.h"
#include "AppKit/GSLayoutManager.h"
#include <math.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSException.h>
@ -34,10 +34,12 @@
#include <Foundation/NSLock.h>
#include <Foundation/NSValue.h>
#include "AppKit/NSTextStorage.h"
#include "AppKit/NSParagraphStyle.h"
#include "AppKit/NSTextContainer.h"
#include "AppKit/NSTextAttachment.h"
#include "AppKit/NSTextContainer.h"
#include "AppKit/NSTextStorage.h"
#include "AppKit/GSLayoutManager.h"
/*
@ -613,17 +615,31 @@ restart:
for (i = 0; i < c; i++)
{
tab = [tabs objectAtIndex: i];
if ([tab location] >= p.x + lf->rect.origin.x)
/*
We cannot use a tab at our exact location; we must
use one beyond it. The reason is that several tabs in
a row would get very odd behavior. Eg. given "\t\t",
the first tab would move (exactly) to the next tab
stop, and the next tab stop would move to the same
tab, thus having no effect.
*/
if ([tab location] > p.x + lf->rect.origin.x)
break;
}
if (i == c)
{
/* TODO: we're already past all the tab stops. what
should we do? */
continue;
should we do?
Pretend that we have tabs every 100 points.
*/
p.x = (floor(p.x / 100.0) + 1.0) * 100.0;
}
else
{
p.x = [tab location] - lf->rect.origin.x;
}
prev_had_non_nominal_width = YES;
p.x = [tab location] - lf->rect.origin.x;
continue;
}