Devices - Added input identification

UI - Tweaked style and enabled Mica on Windows 11
This commit is contained in:
Robert committed 2022-07-24 23:23:59 +02:00
1 parent f09b4a20bf
commit a2ce3b9d9c
18 files changed
+167 -81

No files matched your search

@@ -9,7 +9,7 @@
x:Class="Artemis.UI.Screens.ProfileEditor.Properties.DataBinding.DataBindingView"
x:DataType="dataBinding:DataBindingViewModel">
<Grid RowDefinitions="48,*">
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*">
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*" Background="{DynamicResource ControlFillColorDefaultBrush}">
<TextBlock Grid.Column="0"
Classes="h5"
VerticalAlignment="Center"
@@ -21,13 +21,12 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid RowDefinitions="48,*">
<ContentControl Grid.Row="0" Content="{CompiledBinding PlaybackViewModel}" />
<ContentControl Grid.Row="0" Content="{CompiledBinding PlaybackViewModel}" Background="{DynamicResource ControlFillColorDefaultBrush}" />
<ScrollViewer Grid.Row="1"
Grid.Column="0"
Name="TreeScrollViewer"
Offset="{CompiledBinding #TimelineScrollViewer.Offset, Mode=OneWay}"
Background="{DynamicResource CardStrokeColorDefaultSolidBrush}">
Offset="{CompiledBinding #TimelineScrollViewer.Offset, Mode=OneWay}">
<Grid RowDefinitions="*,Auto">
<ItemsControl Items="{CompiledBinding PropertyGroupViewModels}" Padding="0 0 8 0">
<ItemsControl.ItemTemplate>
@@ -68,6 +67,7 @@
Name="TimelineHeader"
Margin="0 18 0 0"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
Background="{DynamicResource ControlFillColorDefaultBrush}"
HorizontalAlignment="Left"
PixelsPerSecond="{CompiledBinding PixelsPerSecond}"
HorizontalOffset="{CompiledBinding #TimelineScrollViewer.Offset.X, Mode=OneWay}"
@@ -144,8 +144,7 @@
Name="TimelineScrollViewer"
Offset="{CompiledBinding #TreeScrollViewer.Offset, Mode=OneWay}"
VerticalScrollBarVisibility="Hidden">
<ContentControl Content="{CompiledBinding TimelineViewModel}"
Background="{DynamicResource CardStrokeColorDefaultSolidBrush}" />
<ContentControl Content="{CompiledBinding TimelineViewModel}" />
</ScrollViewer>
</Grid>
</ScrollViewer>
@@ -12,7 +12,7 @@
</UserControl.Styles>
<Border Classes="segment-container">
<Grid Name="SegmentGrid"
Background="{DynamicResource CardStrokeColorDefaultSolidBrush}"
Background="{DynamicResource ControlFillColorDefaultBrush}"
Width="{CompiledBinding Width}"
ColumnDefinitions="Auto, Auto,*,Auto">
@@ -12,7 +12,7 @@
</UserControl.Styles>
<Border Classes="segment-container">
<Grid Name="SegmentGrid"
Background="{DynamicResource CardStrokeColorDefaultSolidBrush}"
Background="{DynamicResource ControlFillColorDefaultBrush}"
Width="{CompiledBinding Width}"
ColumnDefinitions="Auto,Auto,*,Auto,Auto">
@@ -9,7 +9,7 @@
<Style Selector="ContentControl.segment-content-control" />
<Style Selector="Border.segment-container">
<Setter Property="Height" Value="18" />
<Setter Property="Height" Value="17" />
</Style>
<Style Selector="Rectangle.resize-visual">
@@ -12,7 +12,7 @@
</UserControl.Styles>
<Border Classes="segment-container">
<Grid Name="SegmentGrid"
Background="{DynamicResource CardStrokeColorDefaultSolidBrush}"
Background="{DynamicResource ControlFillColorDefaultBrush}"
Width="{CompiledBinding Width}"
ColumnDefinitions="*,Auto,Auto">
@@ -69,7 +69,7 @@
</Grid.RowDefinitions>
<Border Grid.Row="0" Classes="card" Padding="0" Margin="4 0 4 4" ClipToBounds="True">
<Grid ColumnDefinitions="Auto,*">
<Border Grid.Column="0" Background="{DynamicResource CardStrokeColorDefaultSolidBrush}">
<Border Grid.Column="0">
<ItemsControl Items="{CompiledBinding Tools}">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="shared:IToolViewModel">