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

fix: MinWidth not work while manually resizing window (#619)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-10-29 19:59:22 +08:00
parent ee20eba047
commit 5c92fbdb37
No known key found for this signature in database
4 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Views/StashesPage.axaml
View file

@ -9,7 +9,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.StashesPage" x:Class="SourceGit.Views.StashesPage"
x:DataType="vm:StashesPage"> x:DataType="vm:StashesPage">
<Grid> <Grid SizeChanged="OnMainLayoutSizeChanged">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.StashesLeftWidth, Mode=TwoWay}" MinWidth="300"/> <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.StashesLeftWidth, Mode=TwoWay}" MinWidth="300"/>
<ColumnDefinition Width="4"/> <ColumnDefinition Width="4"/>

14
src/Views/StashesPage.axaml.cs
View file

@ -9,6 +9,20 @@ namespace SourceGit.Views
InitializeComponent(); InitializeComponent();
} }
private void OnMainLayoutSizeChanged(object sender, SizeChangedEventArgs e)
{
var grid = sender as Grid;
if (grid == null)
return;
var layout = ViewModels.Preference.Instance.Layout;
var width = grid.Bounds.Width;
var maxLeft = width - 304;
if (layout.StashesLeftWidth.Value - maxLeft > 1.0)
layout.StashesLeftWidth = new GridLength(maxLeft, GridUnitType.Pixel);
}
private void OnStashContextRequested(object sender, ContextRequestedEventArgs e) private void OnStashContextRequested(object sender, ContextRequestedEventArgs e)
{ {
if (DataContext is ViewModels.StashesPage vm && sender is Border border) if (DataContext is ViewModels.StashesPage vm && sender is Border border)

2
src/Views/WorkingCopy.axaml
View file

@ -8,7 +8,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="600"
x:Class="SourceGit.Views.WorkingCopy" x:Class="SourceGit.Views.WorkingCopy"
x:DataType="vm:WorkingCopy"> x:DataType="vm:WorkingCopy">
<Grid> <Grid SizeChanged="OnMainLayoutSizeChanged">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.WorkingCopyLeftWidth, Mode=TwoWay}" MinWidth="300"/> <ColumnDefinition Width="{Binding Source={x:Static vm:Preference.Instance}, Path=Layout.WorkingCopyLeftWidth, Mode=TwoWay}" MinWidth="300"/>
<ColumnDefinition Width="5"/> <ColumnDefinition Width="5"/>

14
src/Views/WorkingCopy.axaml.cs
View file

@ -11,6 +11,20 @@ namespace SourceGit.Views
InitializeComponent(); InitializeComponent();
} }
private void OnMainLayoutSizeChanged(object sender, SizeChangedEventArgs e)
{
var grid = sender as Grid;
if (grid == null)
return;
var layout = ViewModels.Preference.Instance.Layout;
var width = grid.Bounds.Width;
var maxLeft = width - 304;
if (layout.WorkingCopyLeftWidth.Value - maxLeft > 1.0)
layout.WorkingCopyLeftWidth = new GridLength(maxLeft, GridUnitType.Pixel);
}
private void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e) private void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
{ {
if (sender is Button button && DataContext is ViewModels.WorkingCopy vm) if (sender is Button button && DataContext is ViewModels.WorkingCopy vm)