@ -166,58 +166,74 @@ namespace Avalonia.Media.TextFormatting
if ( distance < = 0 ) if ( distance < = 0 )
{ {
// hit happens before the line, return the first position
var firstRun = _ textRuns [ 0 ] ; var firstRun = _ textRuns [ 0 ] ;
if ( firstRun is ShapedTextCharacters shapedTextCharacters ) return GetRunCharacterHit ( firstRun , FirstTextSourceIndex , 0 ) ;
{ }
return shapedTextCharacters . GlyphRun . GetCharacterHitFromDistance ( distance , out _ ) ;
}
return _ resolvedFlowDirection = = FlowDirection . LeftToRight ? if ( distance > WidthIncludingTrailingWhitespace )
new CharacterHit ( FirstTextSourceIndex ) : {
new CharacterHit ( FirstTextSourceIndex + Length ) ; var lastRun = _ textRuns [ _ textRuns . Count - 1 ] ;
return GetRunCharacterHit ( lastRun , FirstTextSourceIndex + Length - lastRun . TextSourceLength , lastRun . Size . Width ) ;
} }
// process hit that happens within the line
// process hit that happens within the line
var characterHit = new CharacterHit ( ) ; var characterHit = new CharacterHit ( ) ;
var currentPosition = FirstTextSourceIndex ; var currentPosition = FirstTextSourceIndex ;
var currentDistance = 0.0 ;
foreach ( var currentRun in _ textRuns ) foreach ( var currentRun in _ textRuns )
{ {
switch ( currentRun ) if ( currentDistance + currentRun . Size . Width < distance )
{ {
case ShapedTextCharacters shapedRun : currentDistance + = currentRun . Size . Width ;
{ currentPosition + = currentRun . TextSourceLength ;
characterHit = shapedRun . GlyphRun . GetCharacterHitFromDistance ( distance , out _ ) ;
var offset = Math . Max ( 0 , currentPosition - shapedRun . Text . Start ) ; continue ;
}
characterHit = new CharacterHit ( characterHit . FirstCharacterIndex + offset , characterHit . TrailingLength ) ; characterHit = GetRunCharacterHit ( currentRun , currentPosition , distance - currentDistance ) ;
break ; break ;
} }
default :
return characterHit ;
}
private static CharacterHit GetRunCharacterHit ( DrawableTextRun run , int currentPosition , double distance )
{
CharacterHit characterHit ;
switch ( run )
{
case ShapedTextCharacters shapedRun :
{
characterHit = shapedRun . GlyphRun . GetCharacterHitFromDistance ( distance , out _ ) ;
var offset = Math . Max ( 0 , currentPosition - shapedRun . Text . Start ) ;
if ( ! shapedRun . GlyphRun . IsLeftToRight )
{ {
if ( distance < currentRun . Size . Width / 2 ) offset = Math . Max ( 0 , offset - shapedRun . Text . End ) ;
{
characterHit = new CharacterHit ( currentPosition ) ;
}
else
{
characterHit = new CharacterHit ( currentPosition , currentRun . TextSourceLength ) ;
}
break ;
} }
}
if ( distance < = currentRun . Size . Width ) characterHit = new CharacterHit ( characterHit . FirstCharacterIndex + offset , characterHit . TrailingLength ) ;
{
break ;
}
distance - = currentRun . Size . Width ; break ;
currentPosition + = currentRun . TextSourceLength ; }
default :
{
if ( distance < run . Size . Width / 2 )
{
characterHit = new CharacterHit ( currentPosition ) ;
}
else
{
characterHit = new CharacterHit ( currentPosition , run . TextSourceLength ) ;
}
break ;
}
} }
return characterHit ; return characterHit ;
@ -226,136 +242,122 @@ namespace Avalonia.Media.TextFormatting
/// <inheritdoc/>
/// <inheritdoc/>
public override double GetDistanceFromCharacterHit ( CharacterHit characterHit ) public override double GetDistanceFromCharacterHit ( CharacterHit characterHit )
{ {
var isTrailingHit = characterHit . TrailingLength > 0 ; var flowDirection = _ paragraphProperties . FlowDirection ;
var characterIndex = characterHit . FirstCharacterIndex + characterHit . TrailingLength ; var characterIndex = characterHit . FirstCharacterIndex + characterHit . TrailingLength ;
var currentDistance = Start ;
var currentPosition = FirstTextSourceIndex ; var currentPosition = FirstTextSourceIndex ;
var remainingLength = characterIndex - FirstTextSourceIndex ; var remainingLength = characterIndex - FirstTextSourceIndex ;
GlyphRun ? lastRun = null ; var currentDistance = Start ;
for ( var index = 0 ; index < _ textRuns . Count ; index + + ) if ( flowDirection = = FlowDirection . LeftToRight )
{
for ( var index = 0 ; index < _ textRuns . Count ; index + + )
{
var currentRun = _ textRuns [ index ] ;
if ( TryGetDistanceFromCharacterHit ( currentRun , characterHit , currentPosition , remainingLength ,
flowDirection , out var distance , out _ ) )
{
return currentDistance + distance ;
}
//No hit hit found so we add the full width
currentDistance + = currentRun . Size . Width ;
currentPosition + = currentRun . TextSourceLength ;
remainingLength - = currentRun . TextSourceLength ;
}
}
else
{ {
var textRun = _ textRuns [ index ] ; currentDistance + = WidthIncludingTrailingWhitespace ;
switch ( textRun ) for ( var index = _ textRuns . Count - 1 ; index > = 0 ; index - - )
{ {
case ShapedTextCharacters shapedTextCharacters : var currentRun = _ textRuns [ index ] ;
{
var currentRun = shapedTextCharacters . GlyphRun ;
if ( lastRun ! = null ) if ( TryGetDistanceFromCharacterHit ( currentRun , characterHit , currentPosition , remainingLength ,
{ flowDirection , out var distance , out var currentGlyphRun ) )
if ( ! lastRun . IsLeftToRight & & currentRun . IsLeftToRight & & {
currentRun . Characters . Start = = characterHit . FirstCharacterIndex & & if ( currentGlyphRun ! = null )
characterHit . TrailingLength = = 0 ) {
{ distance = currentGlyphRun . Size . Width - distance ;
return currentDistance ; }
}
}
//Look for a hit in within the current run
return currentDistance - distance ;
if ( currentPosition + remainingLength < = currentPosition + textRun . Text . Length ) }
{
characterHit = new CharacterHit ( textRun . Text . Start + remainingLength ) ;
var distance = currentRun . GetDistanceFromCharacterHit ( characterHit ) ; //No hit hit found so we add the full width
currentDistance - = currentRun . Size . Width ;
currentPosition + = currentRun . TextSourceLength ;
remainingLength - = currentRun . TextSourceLength ;
}
}
return currentDistance + distance ; return currentDistance ;
} }
//Look at the left and right edge of the current run
private static bool TryGetDistanceFromCharacterHit (
if ( currentRun . IsLeftToRight ) DrawableTextRun currentRun ,
{ CharacterHit characterHit ,
if ( _ resolvedFlowDirection = = FlowDirection . LeftToRight & & ( lastRun = = null | | lastRun . IsLeftToRight ) ) int currentPosition ,
{ int remainingLength ,
if ( characterIndex < = currentPosition ) FlowDirection flowDirection ,
{ out double distance ,
return currentDistance ; out GlyphRun ? currentGlyphRun )
} {
} var characterIndex = characterHit . FirstCharacterIndex + characterHit . TrailingLength ;
else var isTrailingHit = characterHit . TrailingLength > 0 ;
{
if ( characterIndex = = currentPosition )
{
return currentDistance ;
}
}
if ( characterIndex = = currentPosition + textRun . Text . Length & & isTrailingHit ) distance = 0 ;
{ currentGlyphRun = null ;
return currentDistance + currentRun . Size . Width ;
}
}
else
{
if ( characterIndex = = currentPosition )
{
return currentDistance + currentRun . Size . Width ;
}
var nextRun = index + 1 < _ textRuns . Count ? switch ( currentRun )
_ textRuns [ index + 1 ] as ShapedTextCharacters : {
null ; case ShapedTextCharacters shapedTextCharacters :
{
currentGlyphRun = shapedTextCharacters . GlyphRun ;
if ( nextRun ! = null ) if ( currentPosition + remainingLength < = currentPosition + currentRun . Text . Length )
{ {
if ( nextRun . ShapedBuffer . IsLeftToRight ) characterHit = new CharacterHit ( currentRun . Text . Start + remainingLength ) ;
{
if ( characterIndex = = currentPosition + textRun . Text . Length )
{
return currentDistance ;
}
}
else
{
if ( currentPosition + nextRun . Text . Length = = characterIndex )
{
return currentDistance ;
}
}
}
else
{
if ( characterIndex > currentPosition + textRun . Text . Length )
{
return currentDistance ;
}
}
}
lastRun = currentRun ; distance = currentGlyphRun . GetDistanceFromCharacterHit ( characterHit ) ;
b reak ; return true ;
} }
default :
if ( currentPosition + remainingLength = = currentPosition + currentRun . Text . Length & & isTrailingHit )
{ {
if ( characterIndex = = currentPosition ) if ( currentGlyphRun . IsLeftToRight | | flowDirection = = FlowDirection . RightToLeft )
{ {
return currentDistance ; distance = currentGlyphRun . Size . Width ;
} }
if ( characterIndex = = currentPosition + textRun . TextSourceLength ) return true ;
{ }
return currentDistance + textRun . Size . Width ;
}
break ; break ;
}
default :
{
if ( characterIndex = = currentPosition )
{
return true ;
} }
}
//No hit hit found so we add the full width
if ( characterIndex = = currentPosition + currentRun . TextSourceLength )
currentDistance + = textRun . Size . Width ; {
currentPosition + = textRun . TextSourceLength ; distance = currentRun . Size . Width ;
remainingLength - = textRun . TextSourceLength ;
if ( remainingLength < = 0 ) return true ;
{
break ; }
}
break ;
}
} }
return currentDistanc e; return fals e;
} }
/// <inheritdoc/>
/// <inheritdoc/>
@ -460,20 +462,33 @@ namespace Avalonia.Media.TextFormatting
var startIndex = currentRun . Text . Start + offset ; var startIndex = currentRun . Text . Start + offset ;
var endOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( double startOffset ;
currentShapedRun . ShapedBuffer . IsLeftToRight ? double endOffset ;
new CharacterHit ( startIndex + remainingLength ) :
new CharacterHit ( startIndex ) ) ;
endX + = endOffset ; if ( currentShapedRun . ShapedBuffer . IsLeftToRight )
{
startOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex ) ) ;
endOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex + remainingLength ) ) ;
}
else
{
endOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex ) ) ;
var startOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( if ( currentPosition < startIndex )
currentShapedRun . ShapedBuffer . IsLeftToRight ? {
new CharacterHit ( startIndex ) : startOffset = endOffset ;
new CharacterHit ( startIndex + remainingLength ) ) ; }
else
{
startOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex + remainingLength ) ) ;
}
}
startX + = startOffset ; startX + = startOffset ;
endX + = endOffset ;
var endHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( endOffset , out _ ) ; var endHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( endOffset , out _ ) ;
var startHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( startOffset , out _ ) ; var startHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( startOffset , out _ ) ;
@ -504,47 +519,40 @@ namespace Avalonia.Media.TextFormatting
} }
//Lines that only contain a linebreak need to be covered here
//Lines that only contain a linebreak need to be covered here
if ( characterLength = = 0 ) if ( characterLength = = 0 )
{ {
characterLength = NewLineLength ; characterLength = NewLineLength ;
} }
var runw idth = endX - startX ; var runW idth = endX - startX ;
var currentRunBounds = new TextRunBounds ( new Rect ( startX , 0 , runw idth , Height ) , currentPosition , characterLength , currentRun ) ; var currentRunBounds = new TextRunBounds ( new Rect ( startX , 0 , runW idth , Height ) , currentPosition , characterLength , currentRun ) ;
if ( lastDirection = = currentDirection & & result . Count > 0 & & MathUtilities . AreClose ( currentRect . Right , startX ) ) if ( ! MathUtilities . IsZero ( runWidth ) | | NewLineLength > 0 )
{ {
currentRect = currentRect . WithWidth ( currentWidth + runwidth ) ; if ( lastDirection = = currentDirection & & result . Count > 0 & & MathUtilities . AreClose ( currentRect . Right , startX ) )
{
currentRect = currentRect . WithWidth ( currentWidth + runWidth ) ;
var textBounds = result [ result . Count - 1 ] ; var textBounds = result [ result . Count - 1 ] ;
textBounds . Rectangle = currentRect ; textBounds . Rectangle = currentRect ;
textBounds . TextRunBounds . Add ( currentRunBounds ) ; textBounds . TextRunBounds . Add ( currentRunBounds ) ;
} }
else else
{ {
currentRect = currentRunBounds . Rectangle ; currentRect = currentRunBounds . Rectangle ;
result . Add ( new TextBounds ( currentRect , currentDirection , new List < TextRunBounds > { currentRunBounds } ) ) ; result . Add ( new TextBounds ( currentRect , currentDirection , new List < TextRunBounds > { currentRunBounds } ) ) ;
}
} }
currentWidth + = runw idth ; currentWidth + = runW idth ;
currentPosition + = characterLength ; currentPosition + = characterLength ;
if ( currentDirection = = FlowDirection . LeftToRight ) if ( currentPosition > characterIndex )
{
if ( currentPosition > characterIndex )
{
break ;
}
}
else
{ {
if ( currentPosition < = firstTextSourceIndex ) break ;
{
break ;
}
} }
startX = endX ; startX = endX ;
@ -571,7 +579,7 @@ namespace Avalonia.Media.TextFormatting
var currentPosition = FirstTextSourceIndex ; var currentPosition = FirstTextSourceIndex ;
var remainingLength = textLength ; var remainingLength = textLength ;
var startX = Start + WidthIncludingTrailingWhitespace ; var startX = WidthIncludingTrailingWhitespace ;
double currentWidth = 0 ; double currentWidth = 0 ;
var currentRect = Rect . Empty ; var currentRect = Rect . Empty ;
@ -582,7 +590,7 @@ namespace Avalonia.Media.TextFormatting
continue ; continue ;
} }
if ( currentPosition + currentRun . TextSourceLength < = firstTextSourceIndex ) if ( currentPosition + currentRun . TextSourceLength < firstTextSourceIndex )
{ {
startX - = currentRun . Size . Width ; startX - = currentRun . Size . Width ;
@ -601,20 +609,31 @@ namespace Avalonia.Media.TextFormatting
currentPosition + = offset ; currentPosition + = offset ;
var startIndex = currentRun . Text . Start + offset ; var startIndex = currentRun . Text . Start + offset ;
double startOffset ;
double endOffset ;
var endOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( if ( currentShapedRun . ShapedBuffer . IsLeftToRight )
currentShapedRun . ShapedBuffer . IsLeftToRight ? {
new CharacterHit ( startIndex + remainingLength ) : if ( currentPosition < startIndex )
new CharacterHit ( startIndex ) ) ; {
startOffset = endOffset = 0 ;
}
else
{
endOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex + remainingLength ) ) ;
endX + = endOffset - currentShapedRun . Size . Width ; startOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex ) ) ;
}
}
else
{
endOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex ) ) ;
var startOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( startOffset = currentShapedRun . GlyphRun . GetDistanceFromCharacterHit ( new CharacterHit ( startIndex + remainingLength ) ) ;
currentShapedRun . ShapedBuffer . IsLeftToRight ? }
new CharacterHit ( startIndex ) :
new CharacterHit ( startIndex + remainingLength ) ) ;
startX + = startOffset - currentShapedRun . Size . Width ; startX - = currentRun . Size . Width - startOffset ;
endX - = currentRun . Size . Width - endOffset ;
var endHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( endOffset , out _ ) ; var endHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( endOffset , out _ ) ;
var startHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( startOffset , out _ ) ; var startHit = currentShapedRun . GlyphRun . GetCharacterHitFromDistance ( startOffset , out _ ) ;
@ -652,41 +671,35 @@ namespace Avalonia.Media.TextFormatting
} }
var runWidth = endX - startX ; var runWidth = endX - startX ;
var currentRunBounds = new TextRunBounds ( new Rect ( startX , 0 , runWidth , Height ) , currentPosition , characterLength , currentRun ) ;
if ( lastDirection = = currentDirection & & result . Count > 0 & & MathUtilities . AreClose ( currentRect . Right , startX ) ) var currentRunBounds = new TextRunBounds ( new Rect ( Start + startX , 0 , runWidth , Height ) , currentPosition , characterLength , currentRun ) ;
if ( ! MathUtilities . IsZero ( runWidth ) | | NewLineLength > 0 )
{ {
currentRect = currentRect . WithWidth ( currentWidth + runWidth ) ; if ( lastDirection = = currentDirection & & result . Count > 0 & & MathUtilities . AreClose ( currentRect . Right , Start + startX ) )
{
currentRect = currentRect . WithWidth ( currentWidth + runWidth ) ;
var textBounds = result [ result . Count - 1 ] ; var textBounds = result [ result . Count - 1 ] ;
textBounds . Rectangle = currentRect ; textBounds . Rectangle = currentRect ;
textBounds . TextRunBounds . Add ( currentRunBounds ) ; textBounds . TextRunBounds . Add ( currentRunBounds ) ;
} }
else else
{ {
currentRect = currentRunBounds . Rectangle ; currentRect = currentRunBounds . Rectangle ;
result . Add ( new TextBounds ( currentRect , currentDirection , new List < TextRunBounds > { currentRunBounds } ) ) ; result . Add ( new TextBounds ( currentRect , currentDirection , new List < TextRunBounds > { currentRunBounds } ) ) ;
} }
}
currentWidth + = runWidth ; currentWidth + = runWidth ;
currentPosition + = characterLength ; currentPosition + = characterLength ;
if ( currentDirection = = FlowDirection . LeftToRight ) if ( currentPosition > characterIndex )
{
if ( currentPosition > characterIndex )
{
break ;
}
}
else
{ {
if ( currentPosition < = firstTextSourceIndex ) break ;
{
break ;
}
} }
lastDirection = currentDirection ; lastDirection = currentDirection ;
@ -698,6 +711,8 @@ namespace Avalonia.Media.TextFormatting
} }
} }
result . Reverse ( ) ;
return result ; return result ;
} }
@ -1302,8 +1317,14 @@ namespace Avalonia.Media.TextFormatting
switch ( textAlignment ) switch ( textAlignment )
{ {
case TextAlignment . Center : case TextAlignment . Center :
return Math . Max ( 0 , ( _ paragraphWidth - width ) / 2 ) ; var start = ( _ paragraphWidth - width ) / 2 ;
if ( paragraphFlowDirection = = FlowDirection . RightToLeft )
{
start - = ( widthIncludingTrailingWhitespace - width ) ;
}
return Math . Max ( 0 , start ) ;
case TextAlignment . Right : case TextAlignment . Right :
return Math . Max ( 0 , _ paragraphWidth - widthIncludingTrailingWhitespace ) ; return Math . Max ( 0 , _ paragraphWidth - widthIncludingTrailingWhitespace ) ;
Luis von der Eltz
4 years ago