Skip to content

Restore window margin logic and update demo navigation #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Huntk23 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Restore window margin logic and update demo navigation #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62a53e2
fix(window): Restore margin logic when window is maximized, full scre…
Huntk23 May 14, 2026
efe2f5d
fix(demo): update page navigation to include Badge page
Huntk23 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ShadUI.Demo/ViewModels/AvatarViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private void BackPage()
[RelayCommand]
private void NextPage()
{
_pageManager.Navigate<ButtonViewModel>();
_pageManager.Navigate<BadgeViewModel>();
}

[ObservableProperty]
Expand Down
2 changes: 1 addition & 1 deletion src/ShadUI.Demo/ViewModels/ButtonViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ButtonViewModel(PageManager pageManager)
[RelayCommand]
private void BackPage()
{
_pageManager.Navigate<AvatarViewModel>();
_pageManager.Navigate<BadgeViewModel>();
}

[RelayCommand]
Expand Down
11 changes: 11 additions & 0 deletions src/ShadUI/Controls/Window/Window.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,22 @@ private void OnWindowStateChanged(WindowState state)
ToggleMaxButtonVisibility(false);
_lastCornerRadius = RootCornerRadius;
RootCornerRadius = new CornerRadius(0);
Margin = new Thickness(-1);
break;
case WindowState.Maximized:
ToggleMaxButtonVisibility(CanMaximize);
RootCornerRadius = _lastCornerRadius;
Margin = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
? new Thickness(7)
: new Thickness(0);
break;
case WindowState.Normal:
ToggleMaxButtonVisibility(CanMaximize);
RootCornerRadius = _lastCornerRadius;
Margin = new Thickness(0);
break;
default:
Margin = new Thickness(0);
break;
}
}
Expand Down