tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Resolve conflicts

pull/9765/head
Benedikt Stebner 3 years ago
parent
54013834e0
commit
a5ee7ebde8
5 changed files with 87 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/Avalonia.Base/Media/TextFormatting/CharacterBufferRange.cs
  2. 150
      src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
  3. 2
      src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
  4. 4
      src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
  5. 2
      src/Avalonia.Base/Media/TextFormatting/TextRun.cs

11
src/Avalonia.Base/Media/TextFormatting/CharacterBufferRange.cs
View File

@ -140,7 +140,7 @@ namespace Avalonia.Media.TextFormatting
throw new ArgumentOutOfRangeException(nameof(index)); throw new ArgumentOutOfRangeException(nameof(index));
} }
#endif #endif
return CharacterBufferReference.CharacterBuffer.Span[CharacterBufferReference.OffsetToFirstChar + index]; return CharacterBuffer.Span[CharacterBufferReference.OffsetToFirstChar + index];
} }
} }
@ -157,8 +157,7 @@ namespace Avalonia.Media.TextFormatting
/// <summary> /// <summary>
/// Gets a span from the character buffer range /// Gets a span from the character buffer range
/// </summary> /// </summary>
public ReadOnlySpan<char> Span => public ReadOnlySpan<char> Span => CharacterBuffer.Span.Slice(OffsetToFirstChar, Length);
CharacterBufferReference.CharacterBuffer.Span.Slice(CharacterBufferReference.OffsetToFirstChar, Length);
/// <summary> /// <summary>
/// Gets the character memory buffer /// Gets the character memory buffer
@ -174,7 +173,7 @@ namespace Avalonia.Media.TextFormatting
/// <summary> /// <summary>
/// Indicate whether the character buffer range is empty /// Indicate whether the character buffer range is empty
/// </summary> /// </summary>
internal bool IsEmpty => CharacterBufferReference.CharacterBuffer.Length == 0 || Length <= 0; internal bool IsEmpty => CharacterBuffer.Length == 0 || Length <= 0;
internal CharacterBufferRange Take(int length) internal CharacterBufferRange Take(int length)
{ {
@ -208,9 +207,7 @@ namespace Avalonia.Media.TextFormatting
return new CharacterBufferRange(new CharacterBufferReference(), 0); return new CharacterBufferRange(new CharacterBufferReference(), 0);
} }
var characterBufferReference = new CharacterBufferReference( var characterBufferReference = new CharacterBufferReference(CharacterBuffer, OffsetToFirstChar + length);
CharacterBufferReference.CharacterBuffer,
CharacterBufferReference.OffsetToFirstChar + length);
return new CharacterBufferRange(characterBufferReference, Length - length); return new CharacterBufferRange(characterBufferReference, Length - length);
} }

150
src/Avalonia.Base/Media/TextFormatting/TextFormatterImpl.cs
View File

@ -130,7 +130,7 @@ namespace Avalonia.Media.TextFormatting
first.Add(split.First); first.Add(split.First);
second.Add(split.Second!); second.Add(split.Second!);
} }
for (var j = 1; j < secondCount; j++) for (var j = 1; j < secondCount; j++)
{ {
@ -237,7 +237,7 @@ namespace Avalonia.Media.TextFormatting
var shaperOptions = new TextShaperOptions(currentRun.Properties!.Typeface.GlyphTypeface, var shaperOptions = new TextShaperOptions(currentRun.Properties!.Typeface.GlyphTypeface,
currentRun.Properties.FontRenderingEmSize, currentRun.Properties.FontRenderingEmSize,
shapeableRun.BidiLevel, currentRun.Properties.CultureInfo, shapeableRun.BidiLevel, currentRun.Properties.CultureInfo,
paragraphProperties.DefaultIncrementalTab, paragraphProperties.LetterSpacing); paragraphProperties.DefaultIncrementalTab, paragraphProperties.LetterSpacing);
shapedRuns.AddRange(ShapeTogether(groupedRuns, characterBufferReference, length, shaperOptions)); shapedRuns.AddRange(ShapeTogether(groupedRuns, characterBufferReference, length, shaperOptions));
@ -478,7 +478,7 @@ namespace Avalonia.Media.TextFormatting
{ {
case ShapedTextRun shapedTextCharacters: case ShapedTextRun shapedTextCharacters:
{ {
if(shapedTextCharacters.ShapedBuffer.Length > 0) if (shapedTextCharacters.ShapedBuffer.Length > 0)
{ {
var firstCluster = shapedTextCharacters.ShapedBuffer.GlyphInfos[0].GlyphCluster; var firstCluster = shapedTextCharacters.ShapedBuffer.GlyphInfos[0].GlyphCluster;
var lastCluster = firstCluster; var lastCluster = firstCluster;
@ -499,7 +499,7 @@ namespace Avalonia.Media.TextFormatting
} }
measuredLength += currentRun.Length; measuredLength += currentRun.Length;
} }
break; break;
} }
@ -525,7 +525,7 @@ namespace Avalonia.Media.TextFormatting
} }
} }
found: found:
return measuredLength != 0; return measuredLength != 0;
} }
@ -565,9 +565,9 @@ namespace Avalonia.Media.TextFormatting
double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection resolvedFlowDirection, double paragraphWidth, TextParagraphProperties paragraphProperties, FlowDirection resolvedFlowDirection,
TextLineBreak? currentLineBreak) TextLineBreak? currentLineBreak)
{ {
if(textRuns.Count == 0) if (textRuns.Count == 0)
{ {
return CreateEmptyTextLine(firstTextSourceIndex,paragraphWidth, paragraphProperties); return CreateEmptyTextLine(firstTextSourceIndex, paragraphWidth, paragraphProperties);
} }
if (!TryMeasureLength(textRuns, paragraphWidth, out var measuredLength)) if (!TryMeasureLength(textRuns, paragraphWidth, out var measuredLength))
@ -583,46 +583,24 @@ namespace Avalonia.Media.TextFormatting
for (var index = 0; index < textRuns.Count; index++) for (var index = 0; index < textRuns.Count; index++)
{ {
var currentRun = textRuns[index];
var runText = new CharacterBufferRange(currentRun.CharacterBufferReference, currentRun.Length);
var lineBreaker = new LineBreakEnumerator(runText);
var breakFound = false; var breakFound = false;
while (lineBreaker.MoveNext()) var currentRun = textRuns[index];
{
if (lineBreaker.Current.Required &&
currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
{
//Explicit break found
breakFound = true;
currentPosition = currentLength + lineBreaker.Current.PositionWrap;
break;
}
if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength) switch (currentRun)
{ {
if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow) case ShapedTextRun:
{ {
if (lastWrapPosition > 0) var runText = new CharacterBufferRange(currentRun.CharacterBufferReference, currentRun.Length);
{
currentPosition = lastWrapPosition;
breakFound = true; var lineBreaker = new LineBreakEnumerator(runText);
break; while (lineBreaker.MoveNext())
}
//Find next possible wrap position (overflow)
if (index < textRuns.Count - 1)
{ {
if (lineBreaker.Current.PositionWrap != currentRun.Length) if (lineBreaker.Current.Required &&
currentLength + lineBreaker.Current.PositionMeasure <= measuredLength)
{ {
//We already found the next possible wrap position. //Explicit break found
breakFound = true; breakFound = true;
currentPosition = currentLength + lineBreaker.Current.PositionWrap; currentPosition = currentLength + lineBreaker.Current.PositionWrap;
@ -630,51 +608,81 @@ namespace Avalonia.Media.TextFormatting
break; break;
} }
while (lineBreaker.MoveNext() && index < textRuns.Count) if (currentLength + lineBreaker.Current.PositionMeasure > measuredLength)
{ {
currentPosition += lineBreaker.Current.PositionWrap; if (paragraphProperties.TextWrapping == TextWrapping.WrapWithOverflow)
if (lineBreaker.Current.PositionWrap != currentRun.Length)
{ {
break; if (lastWrapPosition > 0)
} {
currentPosition = lastWrapPosition;
index++; breakFound = true;
break;
}
//Find next possible wrap position (overflow)
if (index < textRuns.Count - 1)
{
if (lineBreaker.Current.PositionWrap != currentRun.Length)
{
//We already found the next possible wrap position.
breakFound = true;
currentPosition = currentLength + lineBreaker.Current.PositionWrap;
break;
}
while (lineBreaker.MoveNext() && index < textRuns.Count)
{
currentPosition += lineBreaker.Current.PositionWrap;
if (lineBreaker.Current.PositionWrap != currentRun.Length)
{
break;
}
index++;
if (index >= textRuns.Count)
{
break;
}
currentRun = textRuns[index];
runText = new CharacterBufferRange(currentRun.CharacterBufferReference, currentRun.Length);
lineBreaker = new LineBreakEnumerator(runText);
}
}
else
{
currentPosition = currentLength + lineBreaker.Current.PositionWrap;
}
breakFound = true;
if (index >= textRuns.Count)
{
break; break;
} }
currentRun = textRuns[index]; //We overflowed so we use the last available wrap position.
currentPosition = lastWrapPosition == 0 ? measuredLength : lastWrapPosition;
runText = new CharacterBufferRange(currentRun.CharacterBufferReference, currentRun.Length); breakFound = true;
lineBreaker = new LineBreakEnumerator(runText); break;
} }
}
else
{
currentPosition = currentLength + lineBreaker.Current.PositionWrap;
}
breakFound = true; if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
{
lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
}
}
break; break;
} }
//We overflowed so we use the last available wrap position.
currentPosition = lastWrapPosition == 0 ? measuredLength : lastWrapPosition;
breakFound = true;
break;
}
if (lineBreaker.Current.PositionMeasure != lineBreaker.Current.PositionWrap)
{
lastWrapPosition = currentLength + lineBreaker.Current.PositionWrap;
}
} }
if (!breakFound) if (!breakFound)
@ -694,7 +702,7 @@ namespace Avalonia.Media.TextFormatting
var remainingCharacters = splitResult.Second; var remainingCharacters = splitResult.Second;
var lineBreak = remainingCharacters?.Count > 0 ? var lineBreak = remainingCharacters?.Count > 0 ?
new TextLineBreak(currentLineBreak?.TextEndOfLine, resolvedFlowDirection, remainingCharacters) : new TextLineBreak(null, resolvedFlowDirection, remainingCharacters) :
null; null;
if (lineBreak is null && currentLineBreak?.TextEndOfLine != null) if (lineBreak is null && currentLineBreak?.TextEndOfLine != null)

2
src/Avalonia.Base/Media/TextFormatting/TextLeadingPrefixCharacterEllipsis.cs
View File

@ -123,7 +123,7 @@ namespace Avalonia.Media.TextFormatting
switch (run) switch (run)
{ {
case ShapedTextCharacters endShapedRun: case ShapedTextRun endShapedRun:
{ {
if (endShapedRun.TryMeasureCharactersBackwards(availableSuffixWidth, if (endShapedRun.TryMeasureCharactersBackwards(availableSuffixWidth,
out var suffixCount, out var suffixWidth)) out var suffixCount, out var suffixWidth))

4
src/Avalonia.Base/Media/TextFormatting/TextLineImpl.cs
View File

@ -230,12 +230,12 @@ namespace Avalonia.Media.TextFormatting
currentRun = _textRuns[j]; currentRun = _textRuns[j];
if(currentRun is not ShapedTextCharacters) if(currentRun is not ShapedTextRun)
{ {
continue; continue;
} }
shapedRun = (ShapedTextCharacters)currentRun; shapedRun = (ShapedTextRun)currentRun;
if (currentDistance + shapedRun.Size.Width <= distance) if (currentDistance + shapedRun.Size.Width <= distance)
{ {

2
src/Avalonia.Base/Media/TextFormatting/TextRun.cs
View File

@ -44,7 +44,7 @@ namespace Avalonia.Media.TextFormatting
fixed (char* charsPtr = characterBuffer.Span) fixed (char* charsPtr = characterBuffer.Span)
{ {
return new string(charsPtr, _textRun.CharacterBufferReference.OffsetToFirstChar, _textRun.Length); return new string(charsPtr, 0, _textRun.Length);
} }
} }
} }

Write Preview
Loading…
Cancel
Save