From 5f27ddb67f15f73394d8b5d7ca5bcfcf8ba285e2 Mon Sep 17 00:00:00 2001 From: my123 Date: Wed, 12 Apr 2017 13:16:03 +0200 Subject: [PATCH] Time for a new release. --- MastodonUWA/MainPage.xaml.cs | 2 +- MastodonUWA/Toot.xaml.cs | 6 ++++++ MastodonUWA/TootDetails.xaml.cs | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MastodonUWA/MainPage.xaml.cs b/MastodonUWA/MainPage.xaml.cs index fa3b1c7..8989306 100644 --- a/MastodonUWA/MainPage.xaml.cs +++ b/MastodonUWA/MainPage.xaml.cs @@ -78,7 +78,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) var isDark = Application.Current.RequestedTheme == ApplicationTheme.Dark; if (isDark) { - SPanel.Background = new SolidColorBrush(Windows.UI.Colors.DarkGray); + SPanel.Background = new SolidColorBrush(Windows.UI.Colors.Black); } TootCollectionBind = new ObservableCollection(); TootContainer.DataContext = TootCollectionBind; diff --git a/MastodonUWA/Toot.xaml.cs b/MastodonUWA/Toot.xaml.cs index b62186a..82e8b14 100644 --- a/MastodonUWA/Toot.xaml.cs +++ b/MastodonUWA/Toot.xaml.cs @@ -41,6 +41,7 @@ public sealed partial class Toot : UserControl public string toot_id; public string content; IAsyncAction tootrefresh; + int tapdisabled = 0; dynamic toot; public Toot() @@ -94,6 +95,7 @@ public Toot(dynamic status, int principal) } else { + tapdisabled = 1; TootContents.NavigationCompleted -= TootContents_NavigationCompleted; TootContents.NavigationCompleted += TootContents_NavigationCompletedPrimaryToot; RecWeb.Visibility = Visibility.Collapsed; @@ -150,6 +152,10 @@ private void TootContents_PointerPressed(object sender, PointerRoutedEventArgs e private void Grid_Tapped(object sender, TappedRoutedEventArgs e) { + if (tapdisabled == 1) + { + return; + } Frame rootFrame = Window.Current.Content as Frame; rootFrame.Navigate(typeof(TootDetails), toot); } diff --git a/MastodonUWA/TootDetails.xaml.cs b/MastodonUWA/TootDetails.xaml.cs index accecde..a4d13ee 100644 --- a/MastodonUWA/TootDetails.xaml.cs +++ b/MastodonUWA/TootDetails.xaml.cs @@ -47,7 +47,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) var isDark = Application.Current.RequestedTheme == ApplicationTheme.Dark; if (isDark) { - SPanel.Background = new SolidColorBrush(Windows.UI.Colors.DarkGray); + SPanel.Background = new SolidColorBrush(Windows.UI.Colors.Black); } dynamic toot_id = (dynamic)e.Parameter; AuthenticateClass token = GetToken.getAuthClass();