colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-03 09:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3292 from daboe01/tabstop-fix

Browse Source 
fixed: resolve tab stop skipping and dragging positioning
This commit is contained in:
daboe01
2026-08-26 17:59:09 +02:00
committed by GitHub
parent 4c54e6cd31 ca13595e37
commit 378f7bbda1
1 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextView/CPTypesetter.j
+24 -29
View File
@@ -141,31 +141,35 @@ var CPSystemTypesetterFactory,
// Retrieves correct CPTextTab stop accounting for CPArray properties
- (CPTextTab)textTabForWidth:(double)aWidth writingDirection:(CPWritingDirection)direction
{
var tabStops = [_currentParagraph tabStops];
var tabStops = [_currentParagraph tabStops],
defaultInterval = [_currentParagraph defaultTabInterval] || 28.0;
if (!tabStops)
tabStops = [[CPParagraphStyle defaultParagraphStyle] tabStops];
// Calculate the immediate next standard tab stop location based on defaultInterval
var nextDefaultLocation = (Math.floor(aWidth / defaultInterval) + 1) * defaultInterval;
var l = [tabStops count];
// Search for the first custom tab stop strictly greater than aWidth
var nextCustomTab = nil;
if (l === 0)
return nil;
// Find the first tab stop that is strictly greater than the current width
for (var i = 0; i < l; i++)
if (tabStops)
{
var tab = [tabStops objectAtIndex:i];
if ([tab location] > aWidth)
return tab;
var l = [tabStops count];
for (var i = 0; i < l; i++)
{
var tab = [tabStops objectAtIndex:i];
if ([tab location] > aWidth)
{
nextCustomTab = tab;
break;
}
}
}
// If aWidth exceeds the last tab stop, dynamically calculate the next
// tab location using the default tab interval.
var defaultInterval = [_currentParagraph defaultTabInterval] || 28.0;
var nextLocation = CEIL((aWidth + 1.0) / defaultInterval) * defaultInterval;
// If a custom tab stop exists and is closer than (or at) the next default interval, use it
if (nextCustomTab && [nextCustomTab location] <= nextDefaultLocation)
return nextCustomTab;
return [[CPTextTab alloc] initWithType:CPLeftTextAlignment location:nextLocation];
// Otherwise, snap to the immediate next regular tab interval
return [[CPTextTab alloc] initWithType:CPLeftTextAlignment location:nextDefaultLocation];
}
- (BOOL)_flushRange:(CPRange)lineRange
@@ -327,15 +331,6 @@ var CPSystemTypesetterFactory,
lineOrigin.x = isFirstLineOfParagraph ? [_currentParagraph firstLineHeadIndent] : [_currentParagraph headIndent];
isFirstLineOfLayout = NO;
}
// Calculate the right wrapping margin based on tail indent
var tailIndent = [_currentParagraph tailIndent];
if (tailIndent > 0.0)
rightMargin = tailIndent;
else if (tailIndent < 0.0)
rightMargin = containerSizeWidth + tailIndent;
else
rightMargin = containerSizeWidth;
// Handle the layout's very first line indentation
if (isFirstLineOfLayout)
@@ -454,7 +449,7 @@ var CPSystemTypesetterFactory,
}
case 9: // '\t'
{
var nextTab = [self textTabForWidth:rangeWidth + lineOrigin.x writingDirection:0];
var nextTab = [self textTabForWidth:prevRangeWidth + lineOrigin.x writingDirection:0];
isTabStop = YES;
@@ -501,7 +496,7 @@ var CPSystemTypesetterFactory,
}
else
{
rangeWidth += 28.0; // standard fallback spacer
rangeWidth = prevRangeWidth + 28.0; // standard fallback spacer
}
break;
}