michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

style: increase all GridSplitter's size

Browse source
This commit is contained in:
leo 2024-03-26 15:18:34 +08:00
parent 15ab457e74
commit e443e1657b
9 changed files with 48 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/SourceGit/Views/CommitChanges.axaml
View file

@ -11,7 +11,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="256" MinWidth="200" MaxWidth="480"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -152,11 +152,11 @@
</Grid>
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"/>
<Grid Grid.Column="2" Margin="4,0,0,0">
<Grid Grid.Column="2">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>

12
src/SourceGit/Views/FileHistories.axaml
View file

@ -62,7 +62,7 @@
<Grid Grid.Row="1" Background="{DynamicResource Brush.Window}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" MinWidth="300" MaxWidth="600"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -103,12 +103,14 @@
</DataGrid>
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
Background="{DynamicResource Brush.Border0}"/>
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"
BorderThickness="1,0,0,0"
BorderBrush="{DynamicResource Brush.Border2}"/>
<Grid Grid.Column="2">
<ContentControl Margin="4" Content="{Binding DiffContext}">
<ContentControl Margin="0,4,4,4" Content="{Binding DiffContext}">
<ContentControl.DataTemplates>
<DataTemplate DataType="vm:DiffContext">
<v:DiffView/>

5
src/SourceGit/Views/Histories.axaml
View file

@ -9,7 +9,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.Histories"
x:DataType="vm:Histories">
<v:LayoutableGrid RowDefinitions="*,1,*" ColumnDefinitions="*,1,*"
<v:LayoutableGrid RowDefinitions="*,3,*" ColumnDefinitions="*,3,*"
UseHorizontal="{Binding Source={x:Static vm:Preference.Instance}, Path=UseTwoColumnsLayoutInHistories}">
<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
<DataGrid x:Name="commitDataGrid"
@ -134,7 +134,8 @@
<GridSplitter Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"
MinWidth="1" MinHeight="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource Brush.Border0}"/>
Background="{DynamicResource Brush.Window}"
BorderBrush="{DynamicResource Brush.Border0}"/>
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
<Border Background="{DynamicResource Brush.Window}">

4
src/SourceGit/Views/Histories.axaml.cs
View file

@ -44,6 +44,8 @@ namespace SourceGit.Views
child.SetValue(RowSpanProperty, rowSpan);
child.SetValue(ColumnProperty, i);
child.SetValue(ColumnSpanProperty, 1);
if (child is GridSplitter splitter) splitter.BorderThickness = new Thickness(1, 0, 0, 0);
}
}
else
@ -56,6 +58,8 @@ namespace SourceGit.Views
child.SetValue(RowSpanProperty, 1);
child.SetValue(ColumnProperty, 0);
child.SetValue(ColumnSpanProperty, colSpan);
if (child is GridSplitter splitter) splitter.BorderThickness = new Thickness(0, 1, 0, 0);
}
}
}

11
src/SourceGit/Views/Repository.axaml
View file

@ -95,7 +95,7 @@
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250" MinWidth="200" MaxWidth="400"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="3"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -441,10 +441,13 @@
IsVisible="{Binding SearchedCommits.Count, Converter={x:Static c:IntConverters.IsZero}}"/>
</Grid>
<!-- Splitter -->
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
Background="{DynamicResource Brush.Border0}"/>
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"
BorderThickness="0,0,1,0"
BorderBrush="{DynamicResource Brush.Border0}"/>
<!-- Right -->
<Grid Grid.Column="2" RowDefinitions="Auto,*">

8
src/SourceGit/Views/RevisionCompare.axaml
View file

@ -50,7 +50,7 @@
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="256" MinWidth="200" MaxWidth="480"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -191,11 +191,11 @@
</Grid>
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"/>
<Grid Grid.Column="2" Margin="4,0,0,0">
<Grid Grid.Column="2">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>

8
src/SourceGit/Views/RevisionFiles.axaml
View file

@ -13,7 +13,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="256" MinWidth="200" MaxWidth="480"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -67,12 +67,12 @@
</Grid>
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"/>
<!-- File Content Viewer -->
<Grid Grid.Column="2" Margin="4,0,0,0">
<Grid Grid.Column="2">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
<ContentControl Content="{Binding ViewRevisionFileContent}">
<ContentControl.DataTemplates>

12
src/SourceGit/Views/StashesPage.axaml
View file

@ -12,7 +12,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" MinWidth="300"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -122,12 +122,14 @@
</Grid>
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
Background="{DynamicResource Brush.Border0}"/>
MinWidth=".5"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"
BorderThickness="1,0,0,0"
BorderBrush="{DynamicResource Brush.Border0}"/>
<!-- Right -->
<Grid Grid.Column="2" Margin="4">
<Grid Grid.Column="2" Margin="0,4,4,4">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>

12
src/SourceGit/Views/WorkingCopy.axaml
View file

@ -12,7 +12,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" MinWidth="300"/>
<ColumnDefinition Width="1"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
@ -292,12 +292,14 @@
</Grid>
<GridSplitter Grid.Column="1"
Width="1" MinWidth=".5"
HorizontalAlignment="Center" VerticalAlignment="Stretch"
Background="{DynamicResource Brush.Border0}"/>
MinWidth="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="Transparent"
BorderThickness="1,0,0,0"
BorderBrush="{DynamicResource Brush.Border0}"/>
<!-- Right -->
<Grid Grid.Column="2" Margin="4" RowDefinitions="*,Auto,32">
<Grid Grid.Column="2" Margin="0,4,4,4" RowDefinitions="*,Auto,32">
<!-- Select Change Detail -->
<Grid Grid.Row="0">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">