ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Command panel UI improvements

Browse Source
This commit is contained in:
Ádám Kovács
2023-07-27 19:08:15 +02:00
parent 4344938a85
commit 0cc4ff8e1d
1 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/GuiApp/Avalonia/FileTime.GuiApp/Views/MainWindow.axaml
View File

@@ -301,10 +301,9 @@
Value="0" /> Value="0" />
</ia:DataTriggerBehavior> </ia:DataTriggerBehavior>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid ColumnDefinitions="Auto,10">
<ItemsControl <ItemsControl
ItemsSource="{Binding AppState.TimelineViewModel.ParallelCommandsGroups.Collection}" ItemsSource="{Binding AppState.TimelineViewModel.ParallelCommandsGroups.Collection}"
VerticalAlignment="Top" VerticalAlignment="Stretch"
x:Name="CommandGroups"> x:Name="CommandGroups">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
@@ -313,18 +312,19 @@
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border <Grid ColumnDefinitions="300,10" VerticalAlignment="Stretch">
Background="{DynamicResource ContainerBackgroundColor}"
CornerRadius="10"
Height="70"
Margin="0,0,10,0"
Padding="5"
Width="300">
<ScrollViewer> <ScrollViewer>
<ItemsControl ItemsSource="{Binding Commands.Collection}"> <ItemsControl ItemsSource="{Binding Commands.Collection}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<Border BorderThickness="1" Classes.SelectedTimelineCommand="{Binding IsSelected}"> <Border
Background="{DynamicResource ContainerBackgroundColor}"
BorderThickness="1"
Classes.SelectedTimelineCommand="{Binding IsSelected}"
CornerRadius="10"
Margin="0,0,10,0"
Padding="5"
VerticalAlignment="Top">
<Grid ColumnDefinitions="*, *" RowDefinitions="Auto, Auto"> <Grid ColumnDefinitions="*, *" RowDefinitions="Auto, Auto">
<TextBlock Grid.ColumnSpan="2" Text="{Binding DisplayLabel^}" /> <TextBlock Grid.ColumnSpan="2" Text="{Binding DisplayLabel^}" />
@@ -358,10 +358,6 @@
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Rectangle <Rectangle
Fill="{DynamicResource ContentSeparatorBrush}" Fill="{DynamicResource ContentSeparatorBrush}"
@@ -371,6 +367,9 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Width="1" /> Width="1" />
</Grid> </Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid> </Grid>
<ItemsControl Grid.Row="1" ItemsSource="{Binding AppState.Tabs}"> <ItemsControl Grid.Row="1" ItemsSource="{Binding AppState.Tabs}">