javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dead zone in title bar to be draggable

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
View File

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

16
Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
View File

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