From bb8b51896183e8049c141f8949b53ef5a71ebbee Mon Sep 17 00:00:00 2001 From: Ruben Date: Thu, 11 Nov 2021 18:43:48 +0100 Subject: [PATCH] Improve tooltip message display when optimizing images --- PicView/ImageHandling/ImageFunctions.cs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/PicView/ImageHandling/ImageFunctions.cs b/PicView/ImageHandling/ImageFunctions.cs index 1a2dd4553..a84b9d69c 100644 --- a/PicView/ImageHandling/ImageFunctions.cs +++ b/PicView/ImageHandling/ImageFunctions.cs @@ -41,16 +41,8 @@ internal static async Task OptimizeImageAsyncWithErrorChecking() { if (Error_Handling.CheckOutOfRange()) { return; } - var preloadValue = Preloader.Get(Navigation.Pics[Navigation.FolderIndex]); - if (preloadValue == null) - { - await Preloader.AddAsync(Navigation.FolderIndex).ConfigureAwait(false); - } - bool toCenter = false; - var success = await OptimizeImageAsync(Navigation.Pics[Navigation.FolderIndex]).ConfigureAwait(false); - await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Normal, () => { toCenter = UC.QuickSettingsMenuOpen; @@ -62,6 +54,8 @@ await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threa Tooltip.ShowTooltipMessage(Application.Current.Resources["Applying"] as string, toCenter); + var success = await OptimizeImageAsync(Navigation.Pics[Navigation.FolderIndex]).ConfigureAwait(false); + if (success) { await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Render, () => @@ -73,6 +67,17 @@ await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threa Tooltip.CloseToolTipMessage(); }); } + else + { + Tooltip.ShowTooltipMessage($"0%", toCenter); + return; + } + + var preloadValue = Preloader.Get(Navigation.Pics[Navigation.FolderIndex]); + if (preloadValue == null) + { + await Preloader.AddAsync(Navigation.FolderIndex).ConfigureAwait(false); + } var fileInfo = new System.IO.FileInfo(Navigation.Pics[Navigation.FolderIndex]); var readablePrevSize = FileHandling.FileFunctions.GetSizeReadable(preloadValue.fileInfo.Length);