archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

#225, 223: Fixed

Browse Source
This commit is contained in:
Michael Gordeev
2018-12-14 13:35:33 +03:00
parent 7597981420
commit 01d7677803
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube/Controls/VideoPlayer.xaml
+1 -1
View File
@@ -98,7 +98,7 @@
<Grid Grid.Column="1"> <Grid Grid.Column="1">
<TextBlock Name="elapsedTime" Foreground="White" Text="[Elapsed]" VerticalAlignment="Bottom" HorizontalAlignment="Left" ToolTipService.ToolTip="Time elapsed"/> <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"/> <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"/> <ProgressBar Background="#66FFFFFF" Foreground="LightGray" Name="bufferingLevel"/>
</Grid> </Grid>
<Slider PointerCaptureLost="seek_PointerCaptureLost" ValueChanged="seek_ValueChanged" Name="seek" VerticalAlignment="Top" ToolTipService.ToolTip="Seek" IsThumbToolTipEnabled="False" Background="Transparent" HorizontalAlignment="Stretch"/> <Slider PointerCaptureLost="seek_PointerCaptureLost" ValueChanged="seek_ValueChanged" Name="seek" VerticalAlignment="Top" ToolTipService.ToolTip="Seek" IsThumbToolTipEnabled="False" Background="Transparent" HorizontalAlignment="Stretch"/>
FoxTube/Pages/MainPage.xaml.cs
+7 -4
View File
@@ -414,10 +414,11 @@ namespace FoxTube
nav.ExpandedModeThresholdWidth = short.MaxValue; nav.ExpandedModeThresholdWidth = short.MaxValue;
nav.OpenPaneLength = 0; nav.OpenPaneLength = 0;
nav.CompactPaneLength = 0; nav.CompactPaneLength = 0;
if ((videoPlaceholder.Content as VideoPage).player.MiniView) /*if ((videoPlaceholder.Content as VideoPage).player.MiniView)
nav.Margin = new Thickness(0, -48, 0, 0); nav.Margin = new Thickness(0, -46, 0, 0);
else 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 else
{ {
@@ -426,7 +427,9 @@ namespace FoxTube
nav.ExpandedModeThresholdWidth = 1008; nav.ExpandedModeThresholdWidth = 1008;
nav.Margin = new Thickness(0); nav.Margin = new Thickness(0);
nav.OpenPaneLength = 300; nav.OpenPaneLength = 300;
nav.CompactPaneLength = 48; nav.CompactPaneLength = 40;
if (videoPlaceholder.Content != null)
nav.IsPaneOpen = false;
SetTitleBar(); SetTitleBar();
} }
} }