mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 11:56:30 +00:00
UI - Update Avalonia to preview7
UI - Update FluentAvalonia to preview7
This commit is contained in:
1 parent
b1e39dbd39
commit
c50a572363
82 files changed
+214
-208
No files matched your search
+2
-2
@@ -8,8 +8,8 @@
|
||||
x:DataType="screens:LayerPropertyNodeCustomViewModel">
|
||||
<Grid>
|
||||
<StackPanel Spacing="5" VerticalAlignment="Top" IsVisible="{CompiledBinding !OutsideProfileContext}">
|
||||
<ComboBox Classes="condensed" Items="{CompiledBinding ProfileElements}" SelectedItem="{CompiledBinding SelectedProfileElement}" />
|
||||
<ComboBox Classes="condensed" Items="{CompiledBinding LayerProperties}" SelectedItem="{CompiledBinding SelectedLayerProperty}" />
|
||||
<ComboBox Classes="condensed" ItemsSource="{CompiledBinding ProfileElements}" SelectedItem="{CompiledBinding SelectedProfileElement}" />
|
||||
<ComboBox Classes="condensed" ItemsSource="{CompiledBinding LayerProperties}" SelectedItem="{CompiledBinding SelectedLayerProperty}" />
|
||||
</StackPanel>
|
||||
<StackPanel IsVisible="{CompiledBinding OutsideProfileContext}" VerticalAlignment="Center">
|
||||
<TextBlock Classes="BodyStrongTextBlockStyle" TextAlignment="Center">
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
x:DataType="screens:PressedKeyPositionNodeCustomViewModel">
|
||||
<StackPanel>
|
||||
<TextBlock FontSize="13" Margin="0 -2 0 5">Layer</TextBlock>
|
||||
<ComboBox Classes="condensed" Items="{CompiledBinding Layers}" SelectedItem="{CompiledBinding SelectedLayer}" PlaceholderText="Select a layer">
|
||||
<ComboBox Classes="condensed" ItemsSource="{CompiledBinding Layers}" SelectedItem="{CompiledBinding SelectedLayer}" PlaceholderText="Select a layer">
|
||||
<ComboBox.ItemTemplate>
|
||||
<DataTemplate DataType="core:Layer">
|
||||
<StackPanel Spacing="5" Orientation="Horizontal">
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="Artemis.VisualScripting.Nodes.Operators.Screens.EnumEqualsNodeCustomView">
|
||||
<ComboBox IsEnabled="{Binding EnumValues.Count}"
|
||||
Items="{Binding EnumValues}"
|
||||
ItemsSource="{Binding EnumValues}"
|
||||
SelectedItem="{Binding CurrentValue}"
|
||||
PlaceholderText="Select a value"
|
||||
Classes="condensed"
|
||||
|
||||
@@ -18,7 +18,7 @@ public class DisplayValueNodeCustomViewModel : CustomNodeViewModel
|
||||
// Because the DisplayValueNode has no output it never evaluates, manually do so here
|
||||
this.WhenActivated(d =>
|
||||
{
|
||||
DispatcherTimer updateTimer = new(TimeSpan.FromMilliseconds(25.0 / 1000), DispatcherPriority.Normal, Update);
|
||||
DispatcherTimer updateTimer = new(TimeSpan.FromMilliseconds(25.0 / 1000), DispatcherPriority.Background, Update);
|
||||
updateTimer.Start();
|
||||
Disposable.Create(() => updateTimer.Stop()).DisposeWith(d);
|
||||
});
|
||||
|
||||
+1
-1
@@ -6,5 +6,5 @@
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="Artemis.VisualScripting.Nodes.Transition.Screens.EasingFunctionNodeCustomView"
|
||||
x:DataType="screens:EasingFunctionNodeCustomViewModel">
|
||||
<ComboBox Classes="condensed" MinWidth="75" Items="{CompiledBinding EasingViewModels}" SelectedItem="{CompiledBinding SelectedEasingViewModel}" />
|
||||
<ComboBox Classes="condensed" MinWidth="75" ItemsSource="{CompiledBinding EasingViewModels}" SelectedItem="{CompiledBinding SelectedEasingViewModel}" />
|
||||
</UserControl>
|
||||
Reference in new issue
Block a user