diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
index 21c5abd88..a38c1b34c 100644
--- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
+++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
@@ -16,11 +16,11 @@
-
-
+
+
-
-
+
+
diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
index 9e2fc0938..72a221df4 100644
--- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
+++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
@@ -15,11 +15,11 @@
-
-
+
+
-
-
+
+
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 3b69f3087..824cd9624 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -10,10 +10,10 @@
-
+
-
-
+
+
diff --git a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
index eb8ab30a4..742e64458 100644
--- a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
+++ b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
@@ -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()
diff --git a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
index de2964464..67ed37900 100644
--- a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
+++ b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
@@ -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
{
///
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);
+ ///
+ protected override Type StyleKeyOverride => typeof(TextBox);
}
\ No newline at end of file
diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
index 0110ec37e..1b839e4bf 100644
--- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
+++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
@@ -21,12 +21,12 @@
-
-
+
+
-
-
-
+
+
+
diff --git a/src/Artemis.UI.Windows/Program.cs b/src/Artemis.UI.Windows/Program.cs
index 37a113fc2..f9fc5e1f6 100644
--- a/src/Artemis.UI.Windows/Program.cs
+++ b/src/Artemis.UI.Windows/Program.cs
@@ -36,11 +36,6 @@ internal class Program
return AppBuilder.Configure()
.UsePlatformDetect()
.LogToTrace()
- .With(new Win32PlatformOptions
- {
- UseWindowsUIComposition = true,
- CompositionBackdropCornerRadius = 8f
- })
.UseReactiveUI();
}
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 205fae2f5..e6294906e 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -15,12 +15,12 @@
-
+
-
+
-
-
+
+
diff --git a/src/Artemis.UI/Screens/Root/RootView.axaml.cs b/src/Artemis.UI/Screens/Root/RootView.axaml.cs
index 23d822d48..98b9fbc14 100644
--- a/src/Artemis.UI/Screens/Root/RootView.axaml.cs
+++ b/src/Artemis.UI/Screens/Root/RootView.axaml.cs
@@ -18,7 +18,7 @@ public partial class RootView : ReactiveUserControl
{
try
{
- Dispatcher.UIThread.Invoke(() => RootFrame.NavigateFromObject(viewModel));
+ // Dispatcher.UIThread.Invoke(() => RootFrame.NavigateFromObject(viewModel));
}
catch (Exception)
{
diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
index c0e7a1bec..9a7e1bdbb 100644
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@@ -8,8 +8,8 @@
-
-
+
+