Fixing UI

Author: deltakosh

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml

@@ -18,6 +18,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid x:Name="Container"
                   Grid.RowSpan="2"
@@ -57,6 +58,7 @@
                         Click="DirectPrint_Click"
                         Content="Direct Print Me!" />
             </StackPanel>
+            <TextBlock Grid.Row="2" HorizontalAlignment="Center">Direct Print will print the content without removing it from the visual tree (in place).</TextBlock>
         </Grid>
     </Grid>
 </Page>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/PrintHelper/PrintHelperPage.xaml.cs

@@ -33,6 +33,7 @@ private async void Print_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
             _printHelper = new PrintHelper(Container);
             _printHelper.AddFrameworkElementToPrint(PrintableContent);
 
+            _printHelper.OnPrintCanceled += PrintHelper_OnPrintCanceled;
             _printHelper.OnPrintFailed += PrintHelper_OnPrintFailed;
             _printHelper.OnPrintSucceeded += PrintHelper_OnPrintSucceeded;
 
@@ -45,6 +46,7 @@ private async void DirectPrint_Click(object sender, Windows.UI.Xaml.RoutedEventA
 
             _printHelper = new PrintHelper(DirectPrintContainer);
 
+            _printHelper.OnPrintCanceled += PrintHelper_OnPrintCanceled;
             _printHelper.OnPrintFailed += PrintHelper_OnPrintFailed;
             _printHelper.OnPrintSucceeded += PrintHelper_OnPrintSucceeded;
 
@@ -76,5 +78,10 @@ private async void PrintHelper_OnPrintFailed()
             var dialog = new MessageDialog("Printing failed.");
             await dialog.ShowAsync();
         }
+
+        private void PrintHelper_OnPrintCanceled()
+        {
+            ReleasePrintHelper();
+        }
     }
 }

Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml.cs

@@ -262,6 +262,11 @@ private void UpdateRootGridMinWidth()
         }
 
         private void ExpandButton_Click(object sender, RoutedEventArgs e)
+        {
+            ExpandOrCloseProperties();
+        }
+
+        private void ExpandOrCloseProperties()
         {
             var states = VisualStateManager.GetVisualStateGroups(HamburgerMenu).FirstOrDefault();
             string currentState = states.CurrentState.Name;
@@ -280,7 +285,7 @@ private void ExpandButton_Click(object sender, RoutedEventArgs e)
                     }
                     else
                     {
-                        // ane is closed, so let's open it
+                        // pane is closed, so let's open it
                         Grid.SetRowSpan(InfoAreaGrid, 2);
                         Grid.SetRow(InfoAreaGrid, 0);
                         _isPaneOpen = true;
@@ -341,6 +346,11 @@ private void NavigationFrameOnNavigated(object sender, NavigationEventArgs navig
             SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = NavigationFrame.CanGoBack
                 ? AppViewBackButtonVisibility.Visible
                 : AppViewBackButtonVisibility.Collapsed;
+
+            if (_isPaneOpen)
+            {
+                ExpandOrCloseProperties();
+            }
         }
 
         private void HamburgerMenu_OnItemClick(object sender, ItemClickEventArgs e)