From 01d7677803a04dab307d0b81152948d12acaeac2 Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Fri, 14 Dec 2018 13:35:33 +0300
Subject: [PATCH] #225, 223: Fixed

---
 FoxTube/Controls/VideoPlayer.xaml |  2 +-
 FoxTube/Pages/MainPage.xaml.cs    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/FoxTube/Controls/VideoPlayer.xaml b/FoxTube/Controls/VideoPlayer.xaml
index e1fdb50..7d67d05 100644
--- a/FoxTube/Controls/VideoPlayer.xaml
+++ b/FoxTube/Controls/VideoPlayer.xaml
@@ -98,7 +98,7 @@
                     <Grid Grid.Column="1">
                         <TextBlock Name="elapsedTime" Foreground="White" Text="[Elapsed]" VerticalAlignment="Bottom" HorizontalAlignment="Left" ToolTipService.ToolTip="Time elapsed"/>
                         <TextBlock Name="remainingTime" Foreground="White" Text="[Remaining]" VerticalAlignment="Bottom" HorizontalAlignment="Right" ToolTipService.ToolTip="Time remaining"/>
-                        <Grid VerticalAlignment="Top" Margin="0,18,0,0" Height="2">
+                        <Grid VerticalAlignment="Top" Margin="0,15,0,0" Height="2">
                             <ProgressBar Background="#66FFFFFF" Foreground="LightGray" Name="bufferingLevel"/>
                         </Grid>
                         <Slider PointerCaptureLost="seek_PointerCaptureLost" ValueChanged="seek_ValueChanged" Name="seek" VerticalAlignment="Top" ToolTipService.ToolTip="Seek" IsThumbToolTipEnabled="False" Background="Transparent" HorizontalAlignment="Stretch"/>
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index c2e7eab..2208735 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -414,10 +414,11 @@ namespace FoxTube
                 nav.ExpandedModeThresholdWidth = short.MaxValue;
                 nav.OpenPaneLength = 0;
                 nav.CompactPaneLength = 0;
-                if ((videoPlaceholder.Content as VideoPage).player.MiniView)
-                    nav.Margin = new Thickness(0, -48, 0, 0);
+                /*if ((videoPlaceholder.Content as VideoPage).player.MiniView)
+                    nav.Margin = new Thickness(0, -46, 0, 0);
                 else
-                    nav.Margin = new Thickness(0, -50, 0, 0);
+                    nav.Margin = new Thickness(0, -48, 0, 0);*/
+                nav.Margin = new Thickness(0, -45, 0, 0);
             }
             else
             {
@@ -426,7 +427,9 @@ namespace FoxTube
                 nav.ExpandedModeThresholdWidth = 1008;
                 nav.Margin = new Thickness(0);
                 nav.OpenPaneLength = 300;
-                nav.CompactPaneLength = 48;
+                nav.CompactPaneLength = 40;
+                if (videoPlaceholder.Content != null)
+                    nav.IsPaneOpen = false;
                 SetTitleBar();
             }
         }