|
13 | 13 | Icon="/App.ico" |
14 | 14 | Title="{DynamicResource Text.FileHistory}" |
15 | 15 | MinWidth="1280" MinHeight="720"> |
16 | | - <Grid RowDefinitions="Auto,28,1,*"> |
| 16 | + <Grid RowDefinitions="Auto,28,*"> |
17 | 17 | <!-- TitleBar --> |
18 | 18 | <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}"> |
19 | 19 | <!-- Bottom border --> |
|
43 | 43 | <TextBlock Grid.Column="1" Text="{Binding Title, Mode=OneWay}"/> |
44 | 44 | </Grid> |
45 | 45 |
|
46 | | - <!-- Line --> |
47 | | - <Rectangle Grid.Row="2" Height="0.8" HorizontalAlignment="Stretch" VerticalAlignment="Top" Fill="{DynamicResource Brush.Border0}"/> |
48 | | - |
49 | 46 | <!-- Body --> |
50 | | - <Grid Grid.Row="3"> |
| 47 | + <Grid Grid.Row="2"> |
51 | 48 | <Grid.ColumnDefinitions> |
52 | 49 | <ColumnDefinition Width="300" MinWidth="300" MaxWidth="600"/> |
53 | 50 | <ColumnDefinition Width="4"/> |
|
57 | 54 | <ListBox Grid.Column="0" |
58 | 55 | Background="{DynamicResource Brush.Contents}" |
59 | 56 | BorderThickness="1" |
60 | | - Margin="8,4,4,8" |
| 57 | + Margin="8,4,4,8" Padding="4" |
| 58 | + CornerRadius="4" |
61 | 59 | BorderBrush="{DynamicResource Brush.Border2}" |
62 | 60 | ItemsSource="{Binding Revisions, Mode=OneWay}" |
63 | 61 | SelectionMode="Multiple" |
|
118 | 116 | MinWidth="1" |
119 | 117 | HorizontalAlignment="Stretch" VerticalAlignment="Stretch" |
120 | 118 | Background="Transparent" |
121 | | - BorderThickness="1,0,0,0" |
122 | | - BorderBrush="{DynamicResource Brush.Border0}" |
123 | 119 | Focusable="False"/> |
124 | 120 |
|
125 | 121 | <ContentControl Grid.Column="2" Content="{Binding ViewContent}"> |
|
147 | 143 | </DataTemplate> |
148 | 144 |
|
149 | 145 | <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> |
173 | 170 |
|
174 | | - <v:RevisionFileContentViewer Grid.Row="1" Content="{Binding Content}"/> |
175 | | - </Grid> |
| 171 | + <v:RevisionFileContentViewer Grid.Row="1" Content="{Binding Content}"/> |
| 172 | + </Grid> |
| 173 | + </Border> |
176 | 174 | </Border> |
177 | 175 | </DataTemplate> |
178 | 176 | </ContentControl.DataTemplates> |
|
0 commit comments