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

fix: wrong window margin and border if window is started as maximized

Browse source
This commit is contained in:
leo 2024-07-26 12:01:09 +08:00
parent 17b0d7ddcb
commit d3be3e938f
No known key found for this signature in database
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ViewModels/Clone.cs
View file

@ -66,7 +66,7 @@ namespace SourceGit.ViewModels
{
Dispatcher.UIThread.Invoke(() => Remote = text);
}
}
}
catch
{
// ignore

12
src/Views/CommitRefsPresenter.cs
View file

@ -83,14 +83,14 @@ namespace SourceGit.Views
static CommitRefsPresenter()
{
AffectsMeasure<CommitRefsPresenter>(
FontFamilyProperty,
FontFamilyProperty,
FontSizeProperty,
LabelForegroundProperty);
AffectsRender<CommitRefsPresenter>(
IconBackgroundProperty,
IconForegroundProperty,
BranchNameBackgroundProperty,
IconBackgroundProperty,
IconForegroundProperty,
BranchNameBackgroundProperty,
TagNameBackgroundProperty);
}
@ -102,7 +102,7 @@ namespace SourceGit.Views
var iconFG = IconForeground;
var iconBG = IconBackground;
var branchBG = BranchNameBackground;
var tagBG = TagNameBackground;
var tagBG = TagNameBackground;
var x = 0.0;
foreach (var item in _items)
@ -141,7 +141,7 @@ namespace SourceGit.Views
foreach (var decorator in commit.Decorators)
{
var isHead = decorator.Type == Models.DecoratorType.CurrentBranchHead ||
var isHead = decorator.Type == Models.DecoratorType.CurrentBranchHead ||
decorator.Type == Models.DecoratorType.CurrentCommitHead;
var label = new FormattedText(

13
src/Views/Launcher.axaml.cs
View file

@ -11,9 +11,7 @@ namespace SourceGit.Views
public Launcher()
{
var layout = ViewModels.Preference.Instance.Layout;
WindowState = layout.LauncherWindowState;
if (WindowState != WindowState.Maximized)
if (layout.LauncherWindowState != WindowState.Maximized)
{
Width = layout.LauncherWidth;
Height = layout.LauncherHeight;
@ -22,6 +20,15 @@ namespace SourceGit.Views
InitializeComponent();
}
protected override void OnOpened(EventArgs e)
{
base.OnOpened(e);
var layout = ViewModels.Preference.Instance.Layout;
if (layout.LauncherWindowState == WindowState.Maximized)
WindowState = WindowState.Maximized;
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);