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

IconStatusPanel orientation fix

Browse Source
This commit is contained in:
Ádám Kovács
2024-07-19 11:37:39 +02:00
parent 96eb0c07bf
commit 9923312d9c
1 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml
View File

@@ -38,7 +38,8 @@
<Window.Resources> <Window.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="avares://FileTime.GuiApp.App/Resources/SolarizedDarkTheme.axaml" /> <ResourceInclude
Source="avares://FileTime.GuiApp.App/Resources/SolarizedDarkTheme.axaml" />
<ResourceInclude Source="avares://FileTime.GuiApp.App/Resources/Brushes.axaml" /> <ResourceInclude Source="avares://FileTime.GuiApp.App/Resources/Brushes.axaml" />
<ResourceInclude Source="avares://FileTime.GuiApp.App/Resources/Converters.axaml" /> <ResourceInclude Source="avares://FileTime.GuiApp.App/Resources/Converters.axaml" />
<ResourceDictionary> <ResourceDictionary>
@@ -150,7 +151,8 @@
<StackPanel <StackPanel
Margin="20,10" Margin="20,10"
Orientation="Horizontal"> Orientation="Horizontal">
<local:PathPresenter DataContext="{Binding AppState.SelectedTab.Value.CurrentLocation^.FullName.Path, Converter={StaticResource PathPreformatter}}" /> <local:PathPresenter
DataContext="{Binding AppState.SelectedTab.Value.CurrentLocation^.FullName.Path, Converter={StaticResource PathPreformatter}}" />
<TextBlock <TextBlock
Foreground="{StaticResource AccentBrush}" Foreground="{StaticResource AccentBrush}"
Text="{Binding AppState.SelectedTab.Value.CurrentSelectedItem.Value.DisplayNameText}" /> Text="{Binding AppState.SelectedTab.Value.CurrentSelectedItem.Value.DisplayNameText}" />
@@ -158,7 +160,7 @@
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Margin="{Binding IconStatusPanelMargin, Mode=OneTime}" Margin="{Binding IconStatusPanelMargin, Mode=OneTime}"
Orientation="Vertical"> Orientation="Horizontal">
<Image <Image
Width="20" Width="20"
Height="20" Height="20"
@@ -435,7 +437,8 @@
<Grid <Grid
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
ColumnDefinitions="*, Auto"> ColumnDefinitions="*, Auto">
<TextBlock Text="{Binding DisplayLabel.Value}" /> <TextBlock
Text="{Binding DisplayLabel.Value}" />
<Button <Button
Grid.Column="1" Grid.Column="1"
@@ -564,7 +567,8 @@
<Grid <Grid
Grid.Column="2" Grid.Column="2"
RowDefinitions="Auto,*"> RowDefinitions="Auto,*">
<Grid IsVisible="{Binding AppState.SelectedTab.Value.CurrentLocation.Value.IsLoading^, FallbackValue=False}"> <Grid
IsVisible="{Binding AppState.SelectedTab.Value.CurrentLocation.Value.IsLoading^, FallbackValue=False}">
<Image <Image
Width="40" Width="40"
Height="40" Height="40"
@@ -612,11 +616,14 @@
Fill="{DynamicResource ContentSeparatorBrush}" /> Fill="{DynamicResource ContentSeparatorBrush}" />
<Grid Grid.Column="4"> <Grid Grid.Column="4">
<Grid IsVisible="{Binding ItemPreviewService.ItemPreview.Value, Converter={x:Static ObjectConverters.IsNull}}"> <Grid
<Grid IsVisible="{Binding AppState.SelectedTab.Value.SelectedsChildren.Value, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}"> IsVisible="{Binding ItemPreviewService.ItemPreview.Value, Converter={x:Static ObjectConverters.IsNull}}">
<Grid
IsVisible="{Binding AppState.SelectedTab.Value.SelectedsChildren.Value, Converter={x:Static ObjectConverters.IsNotNull}, FallbackValue=False}">
<Grid RowDefinitions="Auto, Auto, *"> <Grid RowDefinitions="Auto, Auto, *">
<Grid IsVisible="{Binding AppState.SelectedTab.Value.CurrentSelectedItemAsContainer.Value.Container.IsLoading^, FallbackValue=False}"> <Grid
IsVisible="{Binding AppState.SelectedTab.Value.CurrentSelectedItemAsContainer.Value.Container.IsLoading^, FallbackValue=False}">
<Image <Image
Width="40" Width="40"
Height="40" Height="40"
@@ -691,8 +698,10 @@
<Grid <Grid
DataContext="{Binding ItemPreviewService.ItemPreview.Value}" DataContext="{Binding ItemPreviewService.ItemPreview.Value}"
IsVisible="{Binding FallbackValue=false, Converter={x:Static ObjectConverters.IsNotNull}}"> IsVisible="{Binding FallbackValue=false, Converter={x:Static ObjectConverters.IsNotNull}}">
<Grid IsVisible="{Binding Name, FallbackValue=false, Converter={StaticResource EqualsConverter}, ConverterParameter={x:Static itemPreview:ElementPreviewViewModel.PreviewName}}"> <Grid
<Grid x:DataType="itemPreviewInterface:IElementPreviewViewModel"> IsVisible="{Binding Name, FallbackValue=false, Converter={StaticResource EqualsConverter}, ConverterParameter={x:Static itemPreview:ElementPreviewViewModel.PreviewName}}">
<Grid
x:DataType="itemPreviewInterface:IElementPreviewViewModel">
<TextBlock <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
IsVisible="{Binding Mode, Converter={StaticResource EqualsConverter}, ConverterParameter={x:Static appCoreModels:ItemPreviewMode.Unknown}, FallbackValue={x:Static appCoreModels:ItemPreviewMode.Unknown}}" IsVisible="{Binding Mode, Converter={StaticResource EqualsConverter}, ConverterParameter={x:Static appCoreModels:ItemPreviewMode.Unknown}, FallbackValue={x:Static appCoreModels:ItemPreviewMode.Unknown}}"
@@ -734,7 +743,8 @@
<DataTemplate> <DataTemplate>
<Grid> <Grid>
<Grid.Width> <Grid.Width>
<MultiBinding Converter="{StaticResource ItemSizeToSizeConverter}"> <MultiBinding
Converter="{StaticResource ItemSizeToSizeConverter}">
<MultiBinding.Bindings> <MultiBinding.Bindings>
<Binding /> <Binding />
<Binding <Binding
@@ -749,7 +759,8 @@
<Rectangle HorizontalAlignment="Stretch"> <Rectangle HorizontalAlignment="Stretch">
<Rectangle.Fill> <Rectangle.Fill>
<MultiBinding Converter="{StaticResource ItemSizeToBrushConverter}"> <MultiBinding
Converter="{StaticResource ItemSizeToBrushConverter}">
<MultiBinding.Bindings> <MultiBinding.Bindings>
<Binding /> <Binding />
<Binding <Binding
@@ -768,7 +779,8 @@
FontWeight="Bold" FontWeight="Bold"
Text="{Binding Name}"> Text="{Binding Name}">
<TextBlock.Foreground> <TextBlock.Foreground>
<MultiBinding Converter="{StaticResource ItemSizeToForegroundBrushConverter}"> <MultiBinding
Converter="{StaticResource ItemSizeToForegroundBrushConverter}">
<MultiBinding.Bindings> <MultiBinding.Bindings>
<Binding /> <Binding />
<Binding <Binding
@@ -784,7 +796,8 @@
FontWeight="Bold" FontWeight="Bold"
Text="{Binding Size.Value, Converter={StaticResource FormatSizeConverter}}"> Text="{Binding Size.Value, Converter={StaticResource FormatSizeConverter}}">
<TextBlock.Foreground> <TextBlock.Foreground>
<MultiBinding Converter="{StaticResource ItemSizeToForegroundBrushConverter}"> <MultiBinding
Converter="{StaticResource ItemSizeToForegroundBrushConverter}">
<MultiBinding.Bindings> <MultiBinding.Bindings>
<Binding /> <Binding />
<Binding <Binding
@@ -895,7 +908,8 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid IsVisible="{Binding PossibleCommands.PossibleCommands.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}"> <Grid
IsVisible="{Binding PossibleCommands.PossibleCommands.Count, Converter={StaticResource NotEqualsConverter}, ConverterParameter=0}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="1" /> <RowDefinition Height="1" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@@ -912,7 +926,8 @@
Grid.Row="1" Grid.Row="1"
ItemsSource="{Binding PossibleCommands.PossibleCommands}"> ItemsSource="{Binding PossibleCommands.PossibleCommands}">
<ItemsRepeater.ItemTemplate> <ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="corevm:IPossibleCommandEntryViewModel"> <DataTemplate
x:DataType="corevm:IPossibleCommandEntryViewModel">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="200" /> <ColumnDefinition Width="200" />
@@ -1063,7 +1078,8 @@
<Grid <Grid
Margin="100" Margin="100"
Background="{DynamicResource ContainerBackgroundColor}"> Background="{DynamicResource ContainerBackgroundColor}">
<local:FrequencyNavigation IsVisible="{Binding ShowWindow^, FallbackValue=False}" /> <local:FrequencyNavigation
IsVisible="{Binding ShowWindow^, FallbackValue=False}" />
</Grid> </Grid>
</Border> </Border>
@@ -1103,4 +1119,4 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>
</Window> </Window>