DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Update Avalonia to 11 rc2.2

Browse Source
This commit is contained in:
Robert committed 2023-07-04 20:24:38 +02:00
1 parent 850038ffd1
commit d18ef4f5f4
10 files changed
+28 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+3 -3
View File
@@ -10,10 +10,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-rc1.1" />
<PackageReference Include="DynamicData" Version="7.13.1" />
<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-rc1" />
src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
+1 -1
View File
@@ -225,7 +225,7 @@ public class DataModelPickerButton : TemplatedControl
private void PathValidationChanged(object? sender, EventArgs e)
{
Dispatcher.UIThread.InvokeAsync(UpdateValueDisplay, DispatcherPriority.DataBind);
Dispatcher.UIThread.InvokeAsync(UpdateValueDisplay, DispatcherPriority.Background);
}
private void UpdateValueDisplay()
src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
+4 -2
View File
@@ -1,11 +1,12 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Styling;
namespace Artemis.UI.Shared;
internal class NoInputTextBox : TextBox, IStyleable
internal class NoInputTextBox : TextBox
{
/// <inheritdoc />
protected override void OnKeyDown(KeyEventArgs e)
@@ -19,5 +20,6 @@ internal class NoInputTextBox : TextBox, IStyleable
// Don't call the base method on purpose
}
Type IStyleable.StyleKey => typeof(TextBox);
/// <inheritdoc />
protected override Type StyleKeyOverride => typeof(TextBox);
}