Merge branch 'release/1.3.4'

CHANGELOG.txt

@@ -1,6 +1,11 @@
 Stylet Changelog
 ================
 
+v1.3.4
+------
+
+ - Change activating order when setting active item in ConductorOneActiveBase (#140)
+
 v1.3.3
 ------
 

Samples/Stylet.Samples.HelloDialog/Dialog1ViewModel.cs

@@ -13,7 +13,7 @@ namespace Stylet.Samples.HelloDialog
 
         public void Close()
         {
-            this.RequestClose(true);
+            this.RequestClose(null);
         }
     }
 }

Samples/Stylet.Samples.HelloDialog/ShellViewModel.cs

@@ -27,7 +27,8 @@ namespace Stylet.Samples.HelloDialog
         public void ShowDialog()
         {
             var dialogVm = this.dialogFactory.CreateDialog1();
-            if (this.windowManager.ShowDialog(dialogVm).GetValueOrDefault())
+            var result = this.windowManager.ShowDialog(dialogVm);
+            if (result.GetValueOrDefault())
                 this.NameString = String.Format("Your name is {0}", dialogVm.Name);
             else
                 this.NameString = "Dialog cancelled";

Stylet/ConductorBaseWithActiveItem.cs

@@ -39,6 +39,8 @@ namespace Stylet
             if (closePrevious)
                 this.CloseAndCleanUp(this.ActiveItem, this.DisposeChildren);
 
+            this._activeItem = newItem;
+
             if (newItem != null)
             {
                 this.EnsureItem(newItem);
@@ -49,7 +51,6 @@ namespace Stylet
                     ScreenExtensions.TryDeactivate(newItem);
             }
 
-            this._activeItem = newItem;
             this.NotifyOfPropertyChange("ActiveItem");
         }
 

StyletUnitTests/ConductorNavigatingTests.cs

@@ -1,4 +1,5 @@
 using Moq;
+using Moq.Protected;
 using NUnit.Framework;
 using Stylet;
 using System;
@@ -285,5 +286,18 @@ namespace StyletUnitTests
             screen.Verify(x => x.Close());
             Assert.Null(this.conductor.ActiveItem);
         }
+
+        [Test]
+        public void NestedActivateItemsResultsInLastActivatedItemActive()
+        {
+            var screen1 = new Mock<Screen>() { CallBase = true };
+            var screen2 = new Screen();
+            screen1.Protected().Setup("OnActivate").Callback(() => conductor.ActivateItem(screen2));
+            ((IScreenState)this.conductor).Activate();
+
+            this.conductor.ActivateItem(screen1.Object);
+
+            Assert.AreEqual(screen2, this.conductor.ActiveItem);
+        }
     }
 }