refactor(ui): unify text and close button in WorktreesOverviewModalView

This commit is contained in:
mika kuns
2026-05-30 17:36:23 +02:00
parent dd453874ba
commit 0f64b1c6e0

View File

@@ -60,27 +60,23 @@
</Border.ContextMenu> </Border.ContextMenu>
<Grid ColumnDefinitions="*,90,80,80"> <Grid ColumnDefinitions="*,90,80,80">
<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="2"> <StackPanel Grid.Column="0" Orientation="Vertical" Spacing="2">
<TextBlock Text="{Binding TaskTitle}" FontWeight="SemiBold"/> <TextBlock Classes="title" Text="{Binding TaskTitle}"/>
<StackPanel Orientation="Horizontal" Spacing="4"> <StackPanel Orientation="Horizontal" Spacing="4">
<TextBlock Text="{Binding TaskStatus}" FontSize="{StaticResource FontSizeEyebrow}" <TextBlock Classes="meta" Text="{Binding TaskStatus}"/>
Foreground="{DynamicResource TextFaintBrush}"/> <TextBlock Classes="meta" Text="•"
<TextBlock Text="•" FontSize="{StaticResource FontSizeEyebrow}" Foreground="{DynamicResource TextFaintBrush}"
IsVisible="{Binding !PathExistsOnDisk}"/> IsVisible="{Binding !PathExistsOnDisk}"/>
<TextBlock Text="phantom" FontSize="{StaticResource FontSizeEyebrow}" Foreground="{DynamicResource StatusErrorBrush}" <TextBlock Classes="meta" Text="phantom" Foreground="{DynamicResource StatusErrorBrush}"
IsVisible="{Binding !PathExistsOnDisk}" IsVisible="{Binding !PathExistsOnDisk}"
ToolTip.Tip="Directory missing on disk"/> ToolTip.Tip="Directory missing on disk"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Border Grid.Column="1" CornerRadius="3" Padding="6,2" VerticalAlignment="Center" <Border Grid.Column="1" CornerRadius="3" Padding="6,2" VerticalAlignment="Center"
Background="{Binding State, Converter={StaticResource WorktreeStateColor}}"> Background="{Binding State, Converter={StaticResource WorktreeStateColor}}">
<TextBlock Text="{Binding State}" FontSize="{StaticResource FontSizeEyebrow}" Foreground="{DynamicResource TextBrush}" <TextBlock Classes="meta" Text="{Binding State}" Foreground="{DynamicResource TextBrush}"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>
</Border> </Border>
<TextBlock Grid.Column="2" Text="{Binding DiffStat}" VerticalAlignment="Center" <TextBlock Grid.Column="2" Classes="meta" Text="{Binding DiffStat}" VerticalAlignment="Center"/>
FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeMono}" <TextBlock Grid.Column="3" Classes="meta" Text="{Binding AgeText}" VerticalAlignment="Center"/>
Foreground="{DynamicResource TextDimBrush}"/>
<TextBlock Grid.Column="3" Text="{Binding AgeText}" VerticalAlignment="Center"
FontSize="{StaticResource FontSizeMono}" Foreground="{DynamicResource TextDimBrush}"/>
</Grid> </Grid>
</Border> </Border>
</DataTemplate> </DataTemplate>
@@ -110,11 +106,6 @@
</Window.Styles> </Window.Styles>
<ctl:ModalShell Title="{Binding Title}" CloseCommand="{Binding CloseCommand}"> <ctl:ModalShell Title="{Binding Title}" CloseCommand="{Binding CloseCommand}">
<ctl:ModalShell.Footer>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="12,2">
<Button Content="Close" Command="{Binding CloseCommand}"/>
</StackPanel>
</ctl:ModalShell.Footer>
<!-- Body: toolbar + content --> <!-- Body: toolbar + content -->
<DockPanel> <DockPanel>
@@ -138,18 +129,10 @@
<StackPanel> <StackPanel>
<!-- Column headers --> <!-- Column headers -->
<Grid ColumnDefinitions="*,90,80,80" Margin="12,0,12,4"> <Grid ColumnDefinitions="*,90,80,80" Margin="12,0,12,4">
<TextBlock Grid.Column="0" Text="TASK" <TextBlock Grid.Column="0" Classes="eyebrow" Text="TASK"/>
FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeEyebrow}" LetterSpacing="1.4" <TextBlock Grid.Column="1" Classes="eyebrow" Text="STATE"/>
Foreground="{DynamicResource TextFaintBrush}"/> <TextBlock Grid.Column="2" Classes="eyebrow" Text="DIFF"/>
<TextBlock Grid.Column="1" Text="STATE" <TextBlock Grid.Column="3" Classes="eyebrow" Text="AGE"/>
FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeEyebrow}" LetterSpacing="1.4"
Foreground="{DynamicResource TextFaintBrush}"/>
<TextBlock Grid.Column="2" Text="DIFF"
FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeEyebrow}" LetterSpacing="1.4"
Foreground="{DynamicResource TextFaintBrush}"/>
<TextBlock Grid.Column="3" Text="AGE"
FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeEyebrow}" LetterSpacing="1.4"
Foreground="{DynamicResource TextFaintBrush}"/>
</Grid> </Grid>
<Border Height="1" Background="{DynamicResource LineBrush}" Margin="0,0,0,8"/> <Border Height="1" Background="{DynamicResource LineBrush}" Margin="0,0,0,8"/>