Fix dead zone in title bar to be draggable

This commit is contained in:
Aleh Khantsevich
2024-04-23 11:03:40 +02:00
parent 75863faf58
commit 26c914be96
2 changed files with 19 additions and 20 deletions

View File

@@ -92,19 +92,18 @@
</animations:Implicit.ShowAnimations>
</TextBlock>
<Grid
x:Name="ContentGrid"
<!-- Shell Sub Content -->
<ContentPresenter
x:Name="ShellContentContainer"
Grid.Column="1"
Background="Transparent">
<!-- Shell Sub Content -->
<ContentPresenter Canvas.ZIndex="2" Content="{x:Bind ShellFrameContent, Mode=OneWay}">
<ContentPresenter.ContentTransitions>
<TransitionCollection>
<PaneThemeTransition Edge="Top" />
</TransitionCollection>
</ContentPresenter.ContentTransitions>
</ContentPresenter>
</Grid>
Canvas.ZIndex="2"
Content="{x:Bind ShellFrameContent, Mode=OneWay}">
<ContentPresenter.ContentTransitions>
<TransitionCollection>
<PaneThemeTransition Edge="Top" />
</TransitionCollection>
</ContentPresenter.ContentTransitions>
</ContentPresenter>
</Grid>
</Grid>
</UserControl>

View File

@@ -101,9 +101,9 @@ namespace Wino.Controls.Advanced
UpdateLayout();
CoreWindowTitleTextBlock.Visibility = Visibility.Collapsed;
ContentGrid.Width = double.NaN;
ContentGrid.Margin = new Thickness(0, 0, 0, 0);
ContentGrid.HorizontalAlignment = HorizontalAlignment.Stretch;
ShellContentContainer.Width = double.NaN;
ShellContentContainer.Margin = new Thickness(0, 0, 0, 0);
ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Stretch;
EmptySpaceWidth.Width = new GridLength(1, GridUnitType.Star);
@@ -118,8 +118,8 @@ namespace Wino.Controls.Advanced
if (!IsReaderNarrowed)
{
ContentGrid.HorizontalAlignment = HorizontalAlignment.Left;
ContentGrid.Width = ReadingPaneLength;
ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
ShellContentContainer.Width = ReadingPaneLength;
}
}
else if (NavigationViewDisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Expanded)
@@ -129,12 +129,12 @@ namespace Wino.Controls.Advanced
CoreWindowTitleTextBlock.Visibility = Visibility.Visible;
// LMargin = OpenPaneLength - LeftMenuStackPanel
ContentGrid.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
ShellContentContainer.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
if (!IsReaderNarrowed)
{
ContentGrid.HorizontalAlignment = HorizontalAlignment.Left;
ContentGrid.Width = ReadingPaneLength;
ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
ShellContentContainer.Width = ReadingPaneLength;
}
}
else