diff --git a/Pixiview/Illust/MainPage.xaml.cs b/Pixiview/Illust/MainPage.xaml.cs index c645e23..ef3c125 100644 --- a/Pixiview/Illust/MainPage.xaml.cs +++ b/Pixiview/Illust/MainPage.xaml.cs @@ -91,6 +91,10 @@ namespace Pixiview.Illust if (scrollDirection != ScrollDirection.Down && y > searchBarHeight - topOffset) { scrollDirection = ScrollDirection.Down; + if (searchBar.IsFocused) + { + searchBar.Unfocus(); + } ViewExtensions.CancelAnimations(searchBar); ViewExtensions.CancelAnimations(panelBar); searchBar.TranslateTo(0, -searchBarHeight, easing: Easing.CubicIn); diff --git a/Pixiview/Illust/ViewIllustPage.xaml.cs b/Pixiview/Illust/ViewIllustPage.xaml.cs index 40dfbfe..13931ac 100644 --- a/Pixiview/Illust/ViewIllustPage.xaml.cs +++ b/Pixiview/Illust/ViewIllustPage.xaml.cs @@ -209,12 +209,10 @@ namespace Pixiview.Illust CornerRadius = 8, HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, - Content = new ActivityIndicator - { - IsRunning = true, - IsVisible = true - } - .DynamicResource(ActivityIndicator.ColorProperty, ThemeBase.WindowColor) + Content = new ActivityIndicator() + .Binding(IsVisibleProperty, nameof(IllustDetailItem.Loading)) + .Binding(ActivityIndicator.IsRunningProperty, nameof(IllustDetailItem.Loading)) + .DynamicResource(ActivityIndicator.ColorProperty, ThemeBase.WindowColor) } .Binding(IsVisibleProperty, nameof(IllustDetailItem.Loading)) .DynamicResource(BackgroundColorProperty, ThemeBase.MaskColor); @@ -222,12 +220,12 @@ namespace Pixiview.Illust // loading original var original = new ActivityIndicator { - IsRunning = true, Margin = new Thickness(10), HorizontalOptions = LayoutOptions.Start, VerticalOptions = LayoutOptions.Start } .Binding(IsVisibleProperty, nameof(IllustDetailItem.Downloading)) + .Binding(ActivityIndicator.IsRunningProperty, nameof(IllustDetailItem.Downloading)) .DynamicResource(ActivityIndicator.ColorProperty, ThemeBase.TextColor); var tap = new TapGestureRecognizer();