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

Merge pull request #88 from anthonyc-r/master

Browse source 
Make GSHorizontalTypesetter use defaultTabInterval if it has run out …
This commit is contained in:
Fred Kiefer 2021-01-16 17:33:39 +01:00 • committed by GitHub
commit d28fe15d03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/GSHorizontalTypesetter.m
View file

@ -870,6 +870,11 @@ restart: ;
*/ */
NSArray *tabs = [curParagraphStyle tabStops]; NSArray *tabs = [curParagraphStyle tabStops];
NSTextTab *tab = nil; NSTextTab *tab = nil;
float defaultInterval = [curParagraphStyle defaultTabInterval];
/* Set it to something reasonable if unset */
if (defaultInterval == 0.0) {
defaultInterval = 100.0;
}
int i, c = [tabs count]; int i, c = [tabs count];
/* Find first tab beyond our current position. */ /* Find first tab beyond our current position. */
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
@ -888,12 +893,11 @@ restart: ;
} }
if (i == c) if (i == c)
{ {
/* TODO: we're already past all the tab stops. what /*
should we do? Tabs after the last value in tabStops should use the
defaultTabInterval provided by NSParagraphStyle.
Pretend that we have tabs every 100 points.
*/ */
p.x = (floor(p.x / 100.0) + 1.0) * 100.0; p.x = (floor(p.x / defaultInterval) + 1.0) * defaultInterval;
} }
else else
{ {