Skip to content

Commit b6b1106

Browse files
ColoryrColoryr
committed
回退avalona11
1 parent 2f7eb9d commit b6b1106

63 files changed

Lines changed: 209 additions & 161 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎nuget/Avalonia.HtmlRenderer.11.3.9.nupkg‎

133 KB
Binary file not shown.

‎nuget/TreeDataGrid.12.0.0-build.1.nupkg‎

-186 KB
Binary file not shown.

‎src/ColorMC.Core/ColorMC.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="HtmlAgilityPack" Version="1.12.4" />
25-
<PackageReference Include="Jint" Version="4.9.2" />
25+
<PackageReference Include="Jint" Version="4.10.1" />
2626
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
27-
<PackageReference Include="Tomlyn" Version="2.4.0" />
27+
<PackageReference Include="Tomlyn" Version="2.9.0" />
2828
<PackageReference Include="Ae.Dns.Client" Version="3.1.0" />
2929
<PackageReference Include="Ae.Dns.Protocol" Version="3.1.0" />
30-
<PackageReference Include="SharpCompress" Version="0.49.0" />
30+
<PackageReference Include="SharpCompress" Version="0.49.1" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/ColorMC.Gui/ColorMC.Gui.csproj‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -355,24 +355,25 @@
355355
<ItemGroup>
356356
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
357357
<PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)" />
358-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="12.0.0" />
358+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
359359
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
360-
<PackageReference Include="Avalonia.HtmlRenderer" Version="12.0.0" />
360+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
361+
<PackageReference Include="Avalonia.HtmlRenderer" Version="11.3.9" />
361362
<PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
362363
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
363-
<PackageReference Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
364-
<PackageReference Include="TreeDataGrid" Version="12.0.0" />
364+
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
365+
<PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1" />
365366
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
366-
<PackageReference Include="DialogHost.Avalonia" Version="0.12.2" />
367-
<PackageReference Include="Markdig" Version="1.2.0" />
368-
<PackageReference Include="MinecraftSkinRender" Version="1.2.0" />
369-
<PackageReference Include="MinecraftSkinRender.Image" Version="1.2.0" />
370-
<PackageReference Include="MinecraftSkinRender.OpenGL" Version="1.2.0" />
367+
<PackageReference Include="DialogHost.Avalonia" Version="0.11.0" />
368+
<PackageReference Include="Markdig" Version="1.3.2" />
369+
<PackageReference Include="MinecraftSkinRender" Version="1.0.0" />
370+
<PackageReference Include="MinecraftSkinRender.Image" Version="1.0.0" />
371+
<PackageReference Include="MinecraftSkinRender.OpenGL" Version="1.0.0" />
371372
<PackageReference Include="Silk.NET.SDL" Version="2.23.0" />
372373
<PackageReference Include="DotNetty.Buffers" Version="0.7.6" />
373374
<PackageReference Include="DotNetty.Common" Version="0.7.6" />
374375
<PackageReference Include="DotNetty.Handlers" Version="0.7.6" />
375-
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.11" />
376+
<PackageReference Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
376377
</ItemGroup>
377378
<ItemGroup>
378379
<ProjectReference Include="..\ColorMC.Core\ColorMC.Core.csproj" />

‎src/ColorMC.Gui/ColorMCGui.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static void Main(string[] args)
9898

9999
TaskScheduler.UnobservedTaskException += (sender, e) =>
100100
{
101-
if (e.Exception.InnerException is DBusErrorReplyException)
101+
if (e.Exception.InnerException is DBusException)
102102
{
103103
return;
104104
}

‎src/ColorMC.Gui/Manager/ImageManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ public static void ReloadImage(GameSettingObj obj)
646646
{
647647
int x = (int)(image.Width * (float)lim / 100);
648648
int y = (int)(image.Height * (float)lim / 100);
649-
var img1 = image.Resize(new SKSizeI(x, y), new SKSamplingOptions(SKFilterMode.Linear, SKMipmapMode.Linear));
649+
var img1 = image.Resize(new SKSizeI(x, y), SKFilterQuality.High);
650650
image.Dispose();
651651
image = img1;
652652
}

‎src/ColorMC.Gui/Manager/WindowManager.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ public static void Show()
11111111
if (ConfigBinding.WindowMode())
11121112
{
11131113
MainWindow?.Show();
1114-
if (AllWindow?.GetPresentationSource()?.RootVisual is Window window)
1114+
if (AllWindow?.GetVisualRoot() is Window window)
11151115
{
11161116
window.Show();
11171117
window.WindowState = WindowState.Normal;
@@ -1121,13 +1121,13 @@ public static void Show()
11211121
else
11221122
{
11231123
MainWindow?.Show();
1124-
if (MainWindow?.GetPresentationSource()?.RootVisual is Window window)
1124+
if (MainWindow?.GetVisualRoot() is Window window)
11251125
{
11261126
window.Show();
11271127
window.WindowState = WindowState.Normal;
11281128
window.Activate();
11291129
}
1130-
else if (CustomWindow?.Icon.GetPresentationSource()?.RootVisual is Window window1)
1130+
else if (CustomWindow?.Icon.GetVisualRoot() is Window window1)
11311131
{
11321132
window1.Show();
11331133
window1.WindowState = WindowState.Normal;
@@ -1144,20 +1144,20 @@ public static void Hide()
11441144
if (ConfigBinding.WindowMode())
11451145
{
11461146
MainWindow?.Hide();
1147-
if (AllWindow?.GetPresentationSource()?.RootVisual is Window window)
1147+
if (AllWindow?.GetVisualRoot() is Window window)
11481148
{
11491149
window.Hide();
11501150
}
11511151
}
11521152
else
11531153
{
11541154
MainWindow?.Hide();
1155-
if (MainWindow?.GetPresentationSource()?.RootVisual is Window window)
1155+
if (MainWindow?.GetVisualRoot() is Window window)
11561156
{
11571157
window.Hide();
1158-
(CustomWindow?.Icon.GetPresentationSource()?.RootVisual as Window)?.Close();
1158+
(CustomWindow?.Icon.GetVisualRoot() as Window)?.Close();
11591159
}
1160-
else if (CustomWindow?.Icon.GetPresentationSource()?.RootVisual is Window window1)
1160+
else if (CustomWindow?.Icon.GetVisualRoot() is Window window1)
11611161
{
11621162
window1.Hide();
11631163
}

‎src/ColorMC.Gui/Style/TextBox.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
Margin="0,0,0,10"
1111
Classes="input1"
1212
Text="测试"
13-
PlaceholderText="配置文件路径" />
13+
Watermark="配置文件路径" />
1414

15-
<TextBox Width="300" PlaceholderText="配置文件路径" />
15+
<TextBox Width="300" Watermark="配置文件路径" />
1616
</StackPanel>
1717
</Border>
1818
</Design.PreviewWith>

‎src/ColorMC.Gui/UI/Controls/Add/AddFileInfoControl.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:app="clr-namespace:ColorMC.Gui.Manager"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7-
xmlns:html="clr-namespace:TheArtOfDev.HtmlRenderer.Avalonia;assembly=Avalonia.HtmlRenderer"
7+
xmlns:html="clr-namespace:Avalonia.HtmlRenderer;assembly=Avalonia.HtmlRenderer"
88
xmlns:item="clr-namespace:ColorMC.Gui.UI.Controls.Items"
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1010
xmlns:model="clr-namespace:ColorMC.Gui.UI.Model.Add"

‎src/ColorMC.Gui/UI/Controls/Add/AddGameTab1Control.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<TextBox
3939
Margin="0,0,10,0"
4040
HorizontalAlignment="Stretch"
41-
PlaceholderText="{setting:Localize AddGameWindow.Tab1.Text2}"
41+
Watermark="{setting:Localize AddGameWindow.Tab1.Text2}"
4242
Text="{Binding Name}" />
4343
</DockPanel>
4444
<TextBlock Margin="0,0,0,5" Text="{setting:Localize Text.GameVersion}" />
@@ -125,7 +125,7 @@
125125
IsEnabled="{Binding CustomLoader}"
126126
IsVisible="{Binding CustomLoader}"
127127
Text="{Binding LoaderLocal}"
128-
PlaceholderText="{setting:Localize AddGameWindow.Tab1.Text15}" />
128+
Watermark="{setting:Localize AddGameWindow.Tab1.Text15}" />
129129
<Panel
130130
Margin="0,0,0,5"
131131
IsEnabled="{Binding CustomLoader}"

0 commit comments

Comments
 (0)