update avalonia to preview6 code.
This commit is contained in:
Родитель
4865ee1dc5
Коммит
ddec6451e0
|
@ -2,6 +2,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<AvaloniaVersion>0.10.0-preview5</AvaloniaVersion>
|
<AvaloniaVersion>0.10.999-cibuild0011494-beta</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<packageSources>
|
<packageSources>
|
||||||
<clear />
|
<clear />
|
||||||
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
|
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
|
||||||
<add key="avalonia-ci" value="https://www.myget.org/F/avalonia-ci/api/v2" />
|
<add key="AvaloniaCI" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" />
|
||||||
</packageSources>
|
</packageSources>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -1059,7 +1059,7 @@ namespace AvaloniaEdit.Rendering
|
||||||
var properties = new TextRunProperties
|
var properties = new TextRunProperties
|
||||||
{
|
{
|
||||||
FontSize = FontSize,
|
FontSize = FontSize,
|
||||||
Typeface = FontManager.Current.GetOrAddTypeface(TextBlock.GetFontFamily(this), TextBlock.GetFontStyle(this), TextBlock.GetFontWeight(this)),
|
Typeface = new Typeface(TextBlock.GetFontFamily(this), TextBlock.GetFontStyle(this), TextBlock.GetFontWeight(this)),
|
||||||
ForegroundBrush = TextBlock.GetForeground(this),
|
ForegroundBrush = TextBlock.GetForeground(this),
|
||||||
CultureInfo = CultureInfo.CurrentCulture
|
CultureInfo = CultureInfo.CurrentCulture
|
||||||
};
|
};
|
||||||
|
|
|
@ -166,7 +166,7 @@ namespace AvaloniaEdit.Text
|
||||||
var formattedText = new FormattedText
|
var formattedText = new FormattedText
|
||||||
{
|
{
|
||||||
Text = stringRange.ToString(),
|
Text = stringRange.ToString(),
|
||||||
Typeface = FontManager.Current.GetOrAddTypeface(tf.FontFamily, tf.Style, tf.Weight),
|
Typeface = new Typeface(tf.FontFamily, tf.Style, tf.Weight),
|
||||||
FontSize = run.FontSize
|
FontSize = run.FontSize
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@ namespace AvaloniaEdit.Text
|
||||||
var size = new FormattedText
|
var size = new FormattedText
|
||||||
{
|
{
|
||||||
Text = StringRange[i].ToString(),
|
Text = StringRange[i].ToString(),
|
||||||
Typeface = FontManager.Current.GetOrAddTypeface(tf.FontFamily, tf.Style, tf.Weight),
|
Typeface = new Typeface(tf.FontFamily, tf.Style, tf.Weight),
|
||||||
FontSize = FontSize
|
FontSize = FontSize
|
||||||
}.Bounds.Size;
|
}.Bounds.Size;
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ namespace AvaloniaEdit.Utils
|
||||||
var formattedText = new FormattedText
|
var formattedText = new FormattedText
|
||||||
{
|
{
|
||||||
Text = text,
|
Text = text,
|
||||||
Typeface = FontManager.Current.GetOrAddTypeface(typeface),
|
Typeface = new Typeface(typeface.Name),
|
||||||
FontSize = emSize.Value
|
FontSize = emSize.Value
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче