Browse Source

fix: static field visibility

pull/8949/head
Giuseppe Lippolis 4 years ago
parent
commit
220bb0774e
  1. 10
      src/Avalonia.Base/Media/TextTrimming.cs
  2. 2
      src/Avalonia.Base/Media/UnicodeRange.cs
  3. 2
      tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs

10
src/Avalonia.Base/Media/TextTrimming.cs

@ -8,7 +8,7 @@ namespace Avalonia.Media
/// </summary> /// </summary>
public abstract class TextTrimming public abstract class TextTrimming
{ {
public static char s_defaultEllipsisChar = '\u2026'; internal const char DefaultEllipsisChar = '\u2026';
/// <summary> /// <summary>
/// Text is not trimmed. /// Text is not trimmed.
@ -18,22 +18,22 @@ namespace Avalonia.Media
/// <summary> /// <summary>
/// Text is trimmed at a character boundary. An ellipsis (...) is drawn in place of remaining text. /// Text is trimmed at a character boundary. An ellipsis (...) is drawn in place of remaining text.
/// </summary> /// </summary>
public static TextTrimming CharacterEllipsis { get; } = new TextTrailingTrimming(s_defaultEllipsisChar, false); public static TextTrimming CharacterEllipsis { get; } = new TextTrailingTrimming(DefaultEllipsisChar, false);
/// <summary> /// <summary>
/// Text is trimmed at a word boundary. An ellipsis (...) is drawn in place of remaining text. /// Text is trimmed at a word boundary. An ellipsis (...) is drawn in place of remaining text.
/// </summary> /// </summary>
public static TextTrimming WordEllipsis { get; } = new TextTrailingTrimming(s_defaultEllipsisChar, true); public static TextTrimming WordEllipsis { get; } = new TextTrailingTrimming(DefaultEllipsisChar, true);
/// <summary> /// <summary>
/// Text is trimmed after a given prefix length. An ellipsis (...) is drawn in between prefix and suffix and represents remaining text. /// Text is trimmed after a given prefix length. An ellipsis (...) is drawn in between prefix and suffix and represents remaining text.
/// </summary> /// </summary>
public static TextTrimming PrefixCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(s_defaultEllipsisChar, 8); public static TextTrimming PrefixCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(DefaultEllipsisChar, 8);
/// <summary> /// <summary>
/// Text is trimmed at a character boundary starting from the beginning. An ellipsis (...) is drawn in place of remaining text. /// Text is trimmed at a character boundary starting from the beginning. An ellipsis (...) is drawn in place of remaining text.
/// </summary> /// </summary>
public static TextTrimming LeadingCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(s_defaultEllipsisChar, 0); public static TextTrimming LeadingCharacterEllipsis { get; } = new TextLeadingPrefixTrimming(DefaultEllipsisChar, 0);
/// <summary> /// <summary>
/// Creates properties that will be used for collapsing lines of text. /// Creates properties that will be used for collapsing lines of text.

2
src/Avalonia.Base/Media/UnicodeRange.cs

@ -9,7 +9,7 @@ namespace Avalonia.Media
/// </summary> /// </summary>
public readonly struct UnicodeRange public readonly struct UnicodeRange
{ {
public static UnicodeRange Default = Parse("0-10FFFD"); public readonly static UnicodeRange Default = Parse("0-10FFFD");
private readonly UnicodeRangeSegment _single; private readonly UnicodeRangeSegment _single;
private readonly IReadOnlyList<UnicodeRangeSegment>? _segments = null; private readonly IReadOnlyList<UnicodeRangeSegment>? _segments = null;

2
tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs

@ -389,7 +389,7 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
if (textLine.Width > 300 || currentHeight + textLine.Height > 240) if (textLine.Width > 300 || currentHeight + textLine.Height > 240)
{ {
textLine = textLine.Collapse(new TextTrailingWordEllipsis(new ReadOnlySlice<char>(new[] { TextTrimming.s_defaultEllipsisChar }), 300, defaultProperties)); textLine = textLine.Collapse(new TextTrailingWordEllipsis(new ReadOnlySlice<char>(new[] { TextTrimming.DefaultEllipsisChar }), 300, defaultProperties));
} }
currentHeight += textLine.Height; currentHeight += textLine.Height;

Loading…
Cancel
Save