archive/FoxTube
Archived
1
0
Fork 0
Code Actions Activity

#218: Fixed

Browse Source
This commit is contained in:
Michael Gordeev
2018-12-14 14:41:08 +03:00
parent 01d7677803
commit 8401497f67
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FoxTube/Pages/MainPage.xaml.cs
+2 -8
View File
@@ -333,9 +333,7 @@ namespace FoxTube
catch { } catch { }
if (cancel) if (cancel)
return; return;
nav.IsPaneOpen = false;
videoPlaceholder.Content = null; videoPlaceholder.Content = null;
MaximizeVideo(); MaximizeVideo();
Fullscreen(false); Fullscreen(false);
@@ -414,10 +412,6 @@ 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)
nav.Margin = new Thickness(0, -46, 0, 0);
else
nav.Margin = new Thickness(0, -48, 0, 0);*/
nav.Margin = new Thickness(0, -45, 0, 0); nav.Margin = new Thickness(0, -45, 0, 0);
} }
else else
@@ -428,7 +422,7 @@ namespace FoxTube
nav.Margin = new Thickness(0); nav.Margin = new Thickness(0);
nav.OpenPaneLength = 300; nav.OpenPaneLength = 300;
nav.CompactPaneLength = 40; nav.CompactPaneLength = 40;
if (videoPlaceholder.Content != null) if (videoPlaceholder.Content != null && nav.IsPaneOpen)
nav.IsPaneOpen = false; nav.IsPaneOpen = false;
SetTitleBar(); SetTitleBar();
} }
FoxTube/Pages/VideoPage.xaml
+3 -3
View File
@@ -159,12 +159,12 @@
<AppBarButton Name="openBrowser" Click="openBrowser_Click" Icon="Globe" Label="Open in browser"/> <AppBarButton Name="openBrowser" Click="openBrowser_Click" Icon="Globe" Label="Open in browser"/>
</CommandBar> </CommandBar>
<StackPanel Grid.Column="1" Name="tabsPlaceholder"> <Grid Grid.Column="1" Name="tabsPlaceholder">
<controls1:Advert/>
<Pivot Grid.Row="1" Name="pivot" SelectedIndex="0" IsHeaderItemsCarouselEnabled="False"> <Pivot Grid.Row="1" Name="pivot" SelectedIndex="0" IsHeaderItemsCarouselEnabled="False">
<PivotItem Header="Suggestions"> <PivotItem Header="Suggestions">
<ScrollViewer> <ScrollViewer>
<StackPanel> <StackPanel>
<controls1:Advert/>
<StackPanel Name="relatedVideos"/> <StackPanel Name="relatedVideos"/>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
@@ -200,7 +200,7 @@
</ScrollViewer> </ScrollViewer>
</PivotItem> </PivotItem>
</Pivot> </Pivot>
</StackPanel> </Grid>
<local:LoadingPage Grid.ColumnSpan="2" Visibility="Collapsed"/> <local:LoadingPage Grid.ColumnSpan="2" Visibility="Collapsed"/>
</Grid> </Grid>