From 4470b626500c79a7b13b1d96737c0bdc5c51562f Mon Sep 17 00:00:00 2001 From: Anton Kasyanov Date: Sat, 17 Jun 2017 19:53:45 +0300 Subject: [PATCH] Minor refactoring in the ThumbnailManager --- Eve-O-Preview/Presentation/ThumbnailManager.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Eve-O-Preview/Presentation/ThumbnailManager.cs b/Eve-O-Preview/Presentation/ThumbnailManager.cs index c03fde9..01f957c 100644 --- a/Eve-O-Preview/Presentation/ThumbnailManager.cs +++ b/Eve-O-Preview/Presentation/ThumbnailManager.cs @@ -128,7 +128,7 @@ namespace EveOPreview.UI if (!this._isHoverEffectActive) { // Do not even move thumbnails with default caption - if (view.Title != ThumbnailManager.DefaultClientTitle) + if (this.IsManageableThumbnail(view)) { view.ThumbnailLocation = this._configuration.GetThumbnailLocation(view.Title, this._activeClientTitle, view.ThumbnailLocation); } @@ -219,9 +219,9 @@ namespace EveOPreview.UI view.SetSizeLimitations(this._configuration.ThumbnailMinimumSize, this._configuration.ThumbnailMaximumSize); view.SetTopMost(this._configuration.ShowThumbnailsAlwaysOnTop); - view.ThumbnailLocation = processTitle == ThumbnailManager.DefaultClientTitle - ? this._configuration.GetDefaultThumbnailLocation() - : this._configuration.GetThumbnailLocation(processTitle, this._activeClientTitle, view.ThumbnailLocation); + view.ThumbnailLocation = this.IsManageableThumbnail(view) + ? this._configuration.GetThumbnailLocation(processTitle, this._activeClientTitle, view.ThumbnailLocation) + : this._configuration.GetDefaultThumbnailLocation(); this._thumbnailViews.Add(processHandle, view); @@ -403,7 +403,7 @@ namespace EveOPreview.UI IThumbnailView view = this._thumbnailViews[id]; - if (view.Title != ThumbnailManager.DefaultClientTitle) + if (this.IsManageableThumbnail(view)) { this.ThumbnailPositionChanged?.Invoke(view.Title, this._activeClientTitle, view.ThumbnailLocation); } @@ -490,5 +490,11 @@ namespace EveOPreview.UI this._configuration.SetClientLayout(process.MainWindowTitle, clientLayout); } } + + // We should no manage some thumbnails (like thumbnail of the EVE client sitting on the login screen) + private bool IsManageableThumbnail(IThumbnailView view) + { + return view.Title != ThumbnailManager.DefaultClientTitle; + } } } \ No newline at end of file