Skip to content

Commit a688da1

Browse files
committed
style: file history page
1 parent ab76225 commit a688da1

1 file changed

Lines changed: 31 additions & 33 deletions

File tree

‎src/Views/FileHistories.axaml‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Icon="/App.ico"
1414
Title="{DynamicResource Text.FileHistory}"
1515
MinWidth="1280" MinHeight="720">
16-
<Grid RowDefinitions="Auto,28,1,*">
16+
<Grid RowDefinitions="Auto,28,*">
1717
<!-- TitleBar -->
1818
<Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
1919
<!-- Bottom border -->
@@ -43,11 +43,8 @@
4343
<TextBlock Grid.Column="1" Text="{Binding Title, Mode=OneWay}"/>
4444
</Grid>
4545

46-
<!-- Line -->
47-
<Rectangle Grid.Row="2" Height="0.8" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource Brush.Border0}"/>
48-
4946
<!-- Body -->
50-
<Grid Grid.Row="3">
47+
<Grid Grid.Row="2">
5148
<Grid.ColumnDefinitions>
5249
<ColumnDefinition Width="300" MinWidth="300" MaxWidth="600"/>
5350
<ColumnDefinition Width="4"/>
@@ -57,7 +54,8 @@
5754
<ListBox Grid.Column="0"
5855
Background="{DynamicResource Brush.Contents}"
5956
BorderThickness="1"
60-
Margin="8,4,4,8"
57+
Margin="8,4,4,8" Padding="4"
58+
CornerRadius="4"
6159
BorderBrush="{DynamicResource Brush.Border2}"
6260
ItemsSource="{Binding Revisions, Mode=OneWay}"
6361
SelectionMode="Multiple"
@@ -118,8 +116,6 @@
118116
MinWidth="1"
119117
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
120118
Background="Transparent"
121-
BorderThickness="1,0,0,0"
122-
BorderBrush="{DynamicResource Brush.Border0}"
123119
Focusable="False"/>
124120

125121
<ContentControl Grid.Column="2" Content="{Binding ViewContent}">
@@ -147,32 +143,34 @@
147143
</DataTemplate>
148144

149145
<DataTemplate DataType="vm:FileHistoriesRevisionFile">
150-
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
151-
<Grid RowDefinitions="26,*">
152-
<Border Grid.Row="0"
153-
BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
154-
Background="{DynamicResource Brush.Window}">
155-
<Grid ColumnDefinitions="Auto,*,Auto">
156-
<Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
157-
<TextBlock Grid.Column="1"
158-
Margin="4,0,0,0"
159-
Text="{Binding Path}"
160-
FontSize="11"
161-
TextTrimming="CharacterEllipsis"/>
162-
<Button Grid.Column="2"
163-
Classes="icon_button"
164-
Width="28"
165-
Background="Transparent"
166-
Click="OnOpenFileWithDefaultEditor"
167-
IsVisible="{Binding CanOpenWithDefaultEditor, Mode=OneWay}"
168-
ToolTip.Tip="{DynamicResource Text.Open}">
169-
<Path Width="12" Height="12" Data="{StaticResource Icons.OpenWith}"/>
170-
</Button>
171-
</Grid>
172-
</Border>
146+
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" CornerRadius="4">
147+
<Border CornerRadius="4" ClipToBounds="True">
148+
<Grid RowDefinitions="26,*">
149+
<Border Grid.Row="0"
150+
BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
151+
Background="{DynamicResource Brush.Window}">
152+
<Grid ColumnDefinitions="Auto,*,Auto">
153+
<Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
154+
<TextBlock Grid.Column="1"
155+
Margin="4,0,0,0"
156+
Text="{Binding Path}"
157+
FontSize="11"
158+
TextTrimming="CharacterEllipsis"/>
159+
<Button Grid.Column="2"
160+
Classes="icon_button"
161+
Width="28"
162+
Background="Transparent"
163+
Click="OnOpenFileWithDefaultEditor"
164+
IsVisible="{Binding CanOpenWithDefaultEditor, Mode=OneWay}"
165+
ToolTip.Tip="{DynamicResource Text.Open}">
166+
<Path Width="12" Height="12" Data="{StaticResource Icons.OpenWith}"/>
167+
</Button>
168+
</Grid>
169+
</Border>
173170

174-
<v:RevisionFileContentViewer Grid.Row="1" Content="{Binding Content}"/>
175-
</Grid>
171+
<v:RevisionFileContentViewer Grid.Row="1" Content="{Binding Content}"/>
172+
</Grid>
173+
</Border>
176174
</Border>
177175
</DataTemplate>
178176
</ContentControl.DataTemplates>

0 commit comments

Comments
 (0)