Merge branch 'develop' into develop

Author: Deadpikle

LICENSE

@@ -1,4 +1,38 @@
-Microsoft Public License (Ms-PL)
+MIT License (MIT)
+
+Copyright (c) 2016 MahApps
+
+Unless indicated otherwise on a per-file basis all source and documentation herein
+is licensed under the MIT license. Some included code is licensed under MS-PL which
+is compatible with the terms of MIT.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-----
+
+Original code from RangeSlider (AvalonControlsLibrary), ToggleSwitch (Microsoft's Silverlight "Cosmopolitan"),
+Callisto (@timheuer), WindowChrome (@Microsoft, @joecastro) and TransitioningContentControl from the
+Silverlight Toolkit 5 are licensed under MS-PL which is compatible with the terms of MIT.
+
+-----
+
+Microsoft Public License (MS-PL)
 
 This license governs use of the accompanying software. If you use the software, you
 accept this license. If you do not accept the license, do not use the software.
@@ -19,4 +53,4 @@ A "contributor" is any person that distributes its contribution under this licen
 (B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
 (C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
 (D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.

Licenses/avaloncontrolslibrary

@@ -75,7 +75,7 @@ public class MetroWindow : Window
         public static readonly DependencyProperty WindowPlacementSettingsProperty = DependencyProperty.Register("WindowPlacementSettings", typeof(IWindowPlacementSettings), typeof(MetroWindow), new PropertyMetadata(null));
         public static readonly DependencyProperty TitleForegroundProperty = DependencyProperty.Register("TitleForeground", typeof(Brush), typeof(MetroWindow));
         public static readonly DependencyProperty IgnoreTaskbarOnMaximizeProperty = DependencyProperty.Register("IgnoreTaskbarOnMaximize", typeof(bool), typeof(MetroWindow), new PropertyMetadata(false));
-        public static readonly DependencyProperty FlyoutsProperty = DependencyProperty.Register("Flyouts", typeof(FlyoutsControl), typeof(MetroWindow), new PropertyMetadata(null));
+        public static readonly DependencyProperty FlyoutsProperty = DependencyProperty.Register("Flyouts", typeof(FlyoutsControl), typeof(MetroWindow), new PropertyMetadata(null, UpdateLogicalChilds));
         public static readonly DependencyProperty WindowTransitionsEnabledProperty = DependencyProperty.Register("WindowTransitionsEnabled", typeof(bool), typeof(MetroWindow), new PropertyMetadata(true));
         public static readonly DependencyProperty MetroDialogOptionsProperty = DependencyProperty.Register("MetroDialogOptions", typeof(MetroDialogSettings), typeof(MetroWindow), new PropertyMetadata(new MetroDialogSettings()));
 
@@ -89,9 +89,9 @@ public class MetroWindow : Window
         public static readonly DependencyProperty IconTemplateProperty = DependencyProperty.Register("IconTemplate", typeof(DataTemplate), typeof(MetroWindow), new PropertyMetadata(null));
         public static readonly DependencyProperty TitleTemplateProperty = DependencyProperty.Register("TitleTemplate", typeof(DataTemplate), typeof(MetroWindow), new PropertyMetadata(null));
 
-        public static readonly DependencyProperty LeftWindowCommandsProperty = DependencyProperty.Register("LeftWindowCommands", typeof(WindowCommands), typeof(MetroWindow), new PropertyMetadata(null));
-        public static readonly DependencyProperty RightWindowCommandsProperty = DependencyProperty.Register("RightWindowCommands", typeof(WindowCommands), typeof(MetroWindow), new PropertyMetadata(null));
-        public static readonly DependencyProperty WindowButtonCommandsProperty = DependencyProperty.Register("WindowButtonCommands", typeof(WindowButtonCommands), typeof(MetroWindow), new PropertyMetadata(null));
+        public static readonly DependencyProperty LeftWindowCommandsProperty = DependencyProperty.Register("LeftWindowCommands", typeof(WindowCommands), typeof(MetroWindow), new PropertyMetadata(null, UpdateLogicalChilds));
+        public static readonly DependencyProperty RightWindowCommandsProperty = DependencyProperty.Register("RightWindowCommands", typeof(WindowCommands), typeof(MetroWindow), new PropertyMetadata(null, UpdateLogicalChilds));
+        public static readonly DependencyProperty WindowButtonCommandsProperty = DependencyProperty.Register("WindowButtonCommands", typeof(WindowButtonCommands), typeof(MetroWindow), new PropertyMetadata(null, UpdateLogicalChilds));
 
         public static readonly DependencyProperty LeftWindowCommandsOverlayBehaviorProperty = DependencyProperty.Register("LeftWindowCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Always));
         public static readonly DependencyProperty RightWindowCommandsOverlayBehaviorProperty = DependencyProperty.Register("RightWindowCommandsOverlayBehavior", typeof(WindowCommandsOverlayBehavior), typeof(MetroWindow), new PropertyMetadata(WindowCommandsOverlayBehavior.Always));
@@ -815,6 +815,7 @@ public void ResetStoredFocus()
         /// </summary>
         public MetroWindow()
         {
+            DataContextChanged += MetroWindow_DataContextChanged;
             Loaded += this.MetroWindow_Loaded;
         }
 
@@ -836,6 +837,14 @@ protected override void OnClosing(CancelEventArgs e)
         }
 #endif
 
+        private void MetroWindow_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (this.LeftWindowCommands != null) this.LeftWindowCommands.DataContext = this.DataContext;
+            if (this.RightWindowCommands != null) this.RightWindowCommands.DataContext = this.DataContext;
+            if (this.WindowButtonCommands != null) this.WindowButtonCommands.DataContext = this.DataContext;
+            if (this.Flyouts != null) this.Flyouts.DataContext = this.DataContext;
+        }
+
         private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
         {
             if (EnableDWMDropShadow)
@@ -957,6 +966,26 @@ private void FlyoutsPreviewMouseDown(object sender, MouseButtonEventArgs e)
             }
         }
 
+
+        private static void UpdateLogicalChilds(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+        {
+            var window = dependencyObject as MetroWindow;
+            if (window == null)
+            {
+                return;
+            }
+            var oldChild = e.OldValue as FrameworkElement;
+            if (oldChild != null)
+            {
+                window.RemoveLogicalChild(oldChild);
+            }
+            var newChild = e.NewValue as FrameworkElement;
+            if (newChild != null)
+            {
+                window.AddLogicalChild(newChild);
+            }
+        }
+
         static MetroWindow()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(MetroWindow), new FrameworkPropertyMetadata(typeof(MetroWindow)));
@@ -966,6 +995,10 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
+            LeftWindowCommandsPresenter = GetTemplateChild(PART_LeftWindowCommands) as ContentPresenter;
+            RightWindowCommandsPresenter = GetTemplateChild(PART_RightWindowCommands) as ContentPresenter;
+            WindowButtonCommandsPresenter = GetTemplateChild(PART_WindowButtonCommands) as ContentPresenter;
+
             if (LeftWindowCommands == null)
                 LeftWindowCommands = new WindowCommands();
             if (RightWindowCommands == null)
@@ -977,10 +1010,6 @@ public override void OnApplyTemplate()
             RightWindowCommands.ParentWindow = this;
             WindowButtonCommands.ParentWindow = this;
 
-            LeftWindowCommandsPresenter = GetTemplateChild(PART_LeftWindowCommands) as ContentPresenter;
-            RightWindowCommandsPresenter = GetTemplateChild(PART_RightWindowCommands) as ContentPresenter;
-            WindowButtonCommandsPresenter = GetTemplateChild(PART_WindowButtonCommands) as ContentPresenter;
-
             overlayBox = GetTemplateChild(PART_OverlayBox) as Grid;
             metroActiveDialogContainer = GetTemplateChild(PART_MetroActiveDialogContainer) as Grid;
             metroInactiveDialogContainer = GetTemplateChild(PART_MetroInactiveDialogsContainer) as Grid;

Licenses/callisto

@@ -107,7 +107,7 @@ public static DependencyObject GetParentObject(this DependencyObject child)
         {
             if (child == null) return null;
 
-            //handle content elements separately
+            // handle content elements separately
             var contentElement = child as ContentElement;
             if (contentElement != null)
             {
@@ -118,16 +118,21 @@ public static DependencyObject GetParentObject(this DependencyObject child)
                 return fce != null ? fce.Parent : null;
             }
 
-            //also try searching for parent in framework elements (such as DockPanel, etc)
+            var childParent = VisualTreeHelper.GetParent(child);
+            if (childParent != null)
+            {
+                return childParent;
+            }
+
+            // also try searching for parent in framework elements (such as DockPanel, etc)
             var frameworkElement = child as FrameworkElement;
             if (frameworkElement != null)
             {
                 DependencyObject parent = frameworkElement.Parent;
                 if (parent != null) return parent;
             }
 
-            //if it's not a ContentElement/FrameworkElement, rely on VisualTreeHelper
-            return VisualTreeHelper.GetParent(child);
+            return null;
         }
 
         /// <summary>