Merge pull request RolandPheasant#174 from t0mburton/master

Prevent app window jumping on start up.
BennettBishop · May 22, 2017 · 1393260 · 1393260
2 parents e0ae1a3 + e2ca535
commit 1393260
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/Source/TailBlazer.Fixtures/SettingsConversion.cs b/Source/TailBlazer.Fixtures/SettingsConversion.cs
@@ -5,6 +5,8 @@
 using TailBlazer.Domain.FileHandling.Recent;
 using TailBlazer.Domain.Formatting;
 using Xunit;
+using TailBlazer.Views.Tail;
+using TailBlazer.Domain.Settings;
 
 namespace TailBlazer.Fixtures
 {
@@ -38,6 +40,23 @@ public void GeneralOptionsWithCultureEnUs()
             SerializeAndDeserializeWithCulture("en-Us");
         }
 
+        [Fact]
+        public void EmptySearchShouldReturnDefault()
+        {
+            var converter = new SearchMetadataToStateConverter();
+            var state = converter.Convert(State.Empty);
+            state.ShouldAllBeEquivalentTo(converter.GetDefaultValue());
+        }
+
+        [Fact]
+        public void NullSearchShouldReturnDefault()
+        {
+            var converter = new SearchMetadataToStateConverter();
+            State nullState = null;
+            var state = converter.Convert(nullState);
+            state.ShouldAllBeEquivalentTo(converter.GetDefaultValue());
+        }
+
         private void SerializeAndDeserializeWithCulture(string cultureName)
         {
             Thread.CurrentThread.CurrentCulture = new CultureInfo(cultureName);

diff --git a/Source/TailBlazer/BootStrap.cs b/Source/TailBlazer/BootStrap.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reactive.Concurrency;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Threading;
@@ -7,6 +8,7 @@
 using TailBlazer.Infrastucture.AppState;
 using TailBlazer.Views.Layout;
 using TailBlazer.Views.WindowManagement;
+using TailBlazer.Domain.Infrastructure;
 
 namespace TailBlazer
 {
@@ -34,10 +36,12 @@ public static void Main(string[] args)
             tempWindowToGetDispatcher.Close();
 
             var layoutServce = container.GetInstance<ILayoutService>();
+            var scheduler = container.GetInstance<ISchedulerProvider>();
+            scheduler.MainThread.Schedule(window.Show);
 
             var appStatePublisher = container.GetInstance<IApplicationStatePublisher>();
             app.Exit += (sender, e) => appStatePublisher.Publish(ApplicationState.ShuttingDown);
-            window.Show();
+
             app.Run();
         }
     }

diff --git a/Source/TailBlazer/Views/Layout/LayoutService.cs b/Source/TailBlazer/Views/Layout/LayoutService.cs
@@ -43,7 +43,7 @@ public void Write()
             }
             catch (Exception ex)
             {
-                _logger.Error(ex, "Problem loading layout");
+                _logger.Error(ex, "Problem saving layout");
             }
         }
 

diff --git a/Source/TailBlazer/Views/Searching/SearchMetadataToStateConverter.cs b/Source/TailBlazer/Views/Searching/SearchMetadataToStateConverter.cs
@@ -33,6 +33,9 @@ private static class Structure
 
         public SearchState[] Convert(State state)
         {
+            if (state == null || state == State.Empty)
+                return GetDefaultValue();
+
             var doc = XDocument.Parse(state.Value);
             var root = doc.Element(Structure.Root);
 
@@ -109,4 +112,4 @@ public SearchState[] GetDefaultValue()
             return Enumerable.Empty<SearchState>().ToArray();
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ public void Write() @@
                 }
                 catch (Exception ex)
                 {
-                    _logger.Error(ex, "Problem loading layout");
+                    _logger.Error(ex, "Problem saving layout");
                 }
             }
@@ Expand Down @@