Merge pull request #2922 from MahApps/develop

MahApps.Metro dev to master v1.5.0

Author: punker76

docs/release-notes/1.5.0.md

@@ -0,0 +1,107 @@
+# 1.5.0 Notes
+
+## Features / Changes / Fixes
+
+- If a dialog is shown in a window other than the MainWindow, `OwningWindow` will be used if available to detect the theme. [#2840](https://github.com/MahApps/MahApps.Metro/pull/2840)
+- Fixed an issue for `DateTimePicker` when the time is cleared if a date is selected [#2837](https://github.com/MahApps/MahApps.Metro/pull/2837)
+- `HamburgerMenu` changes and improvements
+    + New `HamburgerMenuIconItem` helper class which can be used to put any object icon to the menu item.
+    + Fixed tab order and keyboard selection.
+    + `ItemCommand` and `OptionsItemCommand`
+    + `Command` for `HamburgerMenuItem`
+    + New property `PaneForeground` for HamburgerMenu and Splitview and new Foreground/Background brushes `MahApps.Metro.HamburgerMenu.PaneBackgroundBrush`, `MahApps.Metro.HamburgerMenu.PaneForegroundBrush`
+    + Update scroll behavior to match with the UWPCommunityToolkit (see UWP Toolkit Issue [#954](https://github.com/Microsoft/UWPCommunityToolkit/issues/954)).
+        * Add a new dependency property `VerticalScrollBarOnLeftSide` to show the vertical scrollbar on the left side
+        * Use a disappearing ScrollViewer
+    + Add `HamburgerVisibility` property [UWPCommunityToolkit #1020](https://github.com/Microsoft/UWPCommunityToolkit/pull/1020)
+    + Set `Content` for `HamburgerMenu` only if one of the inner ListBox controls has a selected item.
+    + New `HamburgerMenuHeaderTemplate` property to set a header right of the HamburgerMenu button. [@SilverDragon135](https://github.com/SilverDragon135) [#2917](https://github.com/MahApps/MahApps.Metro/pull/2917)
+    + Implement the interface `ICommandSource` and handle Command binding change to hook or unhook command executable.  
+    ![mahapps_hamburgermenu_commands](https://cloud.githubusercontent.com/assets/658431/25019804/3f0822d8-208c-11e7-939c-72be28092a0e.gif)
+    + Add `MahApps.Metro.Styles.HamburgerMenu` style key to the HamburgerMenu.
+- If `ShowInTaskbar = false`, when double click on the title bar of a minimized window, the window will be restored instead of maximized. [#2854](https://github.com/MahApps/MahApps.Metro/pull/2854) [@hausenism](https://github.com/hausenism)
+- Fix WindowCommands tab stop bug [#2858](https://github.com/MahApps/MahApps.Metro/pull/2858) [@neilt6](https://github.com/neilt6)
+- Don't overwrite cancellation for window close event [#2868](https://github.com/MahApps/MahApps.Metro/pull/2868) [@batzen](https://github.com/batzen)
+- Expose close button margin for `MetroTabItem` [#2803](https://github.com/MahApps/MahApps.Metro/pull/2803)
+- New `Badged` control. Thx to [@ButchersBoy](https://github.com/ButchersBoy)  
+![image](https://cloud.githubusercontent.com/assets/658431/23340345/d7dc4c86-fc34-11e6-838b-1ebee9381c7d.png)
+- The `ControlsHelper.CornerRadius` can now used for `SplitButton` and `DropDownButton`.
+- New underline types for `TabControl` and `MetroTabControl` [#2902](https://github.com/MahApps/MahApps.Metro/pull/2902)
+    + Adds a new `Underlined` attached property to `TabControlHelper` which controls the type of the underline type. The old `IsUnderlined` property is now obsolete.  
+    ```
+    /// <summary>
+    /// Specifies the underline position of a TabControl.
+    /// </summary>
+    public enum UnderlinedType
+    {
+        None, // nothing
+        TabItems, // the old behavior with `IsUnderlined="True"`
+        SelectedTabItem, // selected TabItem underlined + underline hover effect for unselected items
+        TabPanel // underlined TabPanel and selected/hovered TabItem
+    }
+    ```
+    + Add also new `Brush` attached properties to enable easy changing the underline brushes.  
+    ```
+    TabControlHelper.UnderlineBrush
+    TabControlHelper.UnderlineSelectedBrush
+    TabControlHelper.UnderlineMouseOverBrush
+    TabControlHelper.UnderlineMouseOverSelectedBrush
+    ```
+    ![mahapps_newunderline4](https://cloud.githubusercontent.com/assets/658431/24204520/0e6f3cbc-0f19-11e7-8a2b-f40752918a96.gif)
+- New underline types also for `AnimatedTabControl` and `AnimatedSingleRowTabControl` styles and for `MetroAnimatedTabControl` and `MetroAnimatedSingleRowTabControl` [#2905](https://github.com/MahApps/MahApps.Metro/pull/2905)
+- Fix / improve `AnimatedSingleRowTabControl` styles
+    + Fix template changing (doesn't works if TabStripPlacement was changed)
+    + Disappear arrow repeat buttons
+    + Use brush, hover and pressed brush like normal ScrollViewer
+- Fixed `ClearTypeHint` and wrong `Margin` for `ComboBox` and `ComboBoxItem` [#2903](https://github.com/MahApps/MahApps.Metro/issues/2903)
+- Fix `ListView` style issues
+    + Use accent brush for highlighted border
+    + Fix SnapsToDevicePixels usage
+    + Fix disabled foreground brush
+- Fix SnapsToDevicePixels usage for `CheckBox`
+- `Flyout` changes and improvements
+    + Fix `Flyout` modal usage. All title bar commands are now hidden if a `Flyout` is modal.
+    + Fix background and foreground usage of controls in a `Flyout` if user changes theme on the fly. [#2337](https://github.com/MahApps/MahApps.Metro/issues/2337) The `Flyout` has a different background, so we should override some background and foreground brushes and colors.
+    + Change `Flyout` from `ContentControl` to `HeaderedContentControl` which has the correct properties for headers.
+    + Enable `Border` for `Flyout`
+- Use `GrayBrush7` and `WhiteBrush` for menu `Separator` instead fixed colors.
+- Fix BindingExpression at `DropDownButton`. Don't set `ItemTemplate`to `ContentTemplate`, `ItemTemplateSelector` to `ContentTemplateSelector` and `ItemStringFormat` to `ContentStringFormat`. This breaks the whole usage of the content stuff and shows a BindingExpression path error. [#2883](https://github.com/MahApps/MahApps.Metro/issues/2883)
+- New `UsernameCharacterCasing` property for `LoginDialogSettings` [#2683](https://github.com/MahApps/MahApps.Metro/issues/2683)
+- Fix `SelectionChanged` event of `SplitButton` which fires now only once.
+- Add `TransitionCompleted` event to `MetroContentControl` and `WindowTransitionCompleted` event to `MetroWindow` which will be fired after the loaded Storyboard is completed.
+- Add new `WatermarkAlignment` attached property to `TextBoxHelper` which indicates the horizontal alignment of the watermark (incl. floating watermark).  
+![mahapps_watermark](https://cloud.githubusercontent.com/assets/658431/25019759/14a50b28-208c-11e7-93cb-406fe8b65b7c.gif)
+- Add new `DataGridHelper` with `EnableCellEditAssist` attached property which enabled direct editing for CheckBox and ComboBox cells. (default to false) Thx to [@ButchersBoy](https://github.com/ButchersBoy) (taken from [MaterialDesignInXamlToolkit](https://github.com/ButchersBoy/MaterialDesignInXamlToolkit))
+
+## Closed Issues
+
+- [#2835](https://github.com/MahApps/MahApps.Metro/issues/2835) ShowMessageAnsync() causes exception
+- [#2848](https://github.com/MahApps/MahApps.Metro/issues/2848) HamburgerMenu Command MVVM
+- [#2866](https://github.com/MahApps/MahApps.Metro/issues/2866) Validation-Popup won't be opened after closing by mouse left button down
+- [#2870](https://github.com/MahApps/MahApps.Metro/issues/2870) MahApps Not Thread Safe But Should Be [Test Case]
+- [#2877](https://github.com/MahApps/MahApps.Metro/issues/2877) Can't bind to ShowTitleBar
+- [#2871](https://github.com/MahApps/MahApps.Metro/issues/2871) SplitButton CornerRadius
+- [#2862](https://github.com/MahApps/MahApps.Metro/issues/2862) Flyout close button icon is incorrect when setting flow direction right to left
+- [#1938](https://github.com/MahApps/MahApps.Metro/issues/1938) Problem with window size
+- [#2066](https://github.com/MahApps/MahApps.Metro/issues/2066) On Windows 8 a window with height 23px resizes to 39px after dragging
+- [#2792](https://github.com/MahApps/MahApps.Metro/issues/2792) Win32Exception on closing window
+- [#2886](https://github.com/MahApps/MahApps.Metro/issues/2886) NumericUpDown: HasDecimals=False & using a bound StringFormat allows to enter a decimal point [@davericardo](https://github.com/davericardo)
+- [#2885](https://github.com/MahApps/MahApps.Metro/issues/2885) [Bug] Badged Control Causes Window Loading to Hang
+- [#2895](https://github.com/MahApps/MahApps.Metro/issues/2895) [RFC] [Enhancement] Proposed TabControlHelper.IsUnderlined Change
+- [#2903](https://github.com/MahApps/MahApps.Metro/issues/2903) 1 pixel space between ComboBoxItems closes ComboBox
+- [#2841](https://github.com/MahApps/MahApps.Metro/issues/2841) Modal flyout issue
+- [#2337](https://github.com/MahApps/MahApps.Metro/issues/2337) Flyout style from Accent to Light is not working
+- [#2883](https://github.com/MahApps/MahApps.Metro/issues/2883) Can Reproduce BindingExpression path error: ... property not found ... On DropDownButton
+- [#2683](https://github.com/MahApps/MahApps.Metro/issues/2683) [Question] Force TextBox uppercase in ShowLoginAsync
+- [#2857](https://github.com/MahApps/MahApps.Metro/issues/2857) HamburgerMenuItem Scrolling
+- [#1835](https://github.com/MahApps/MahApps.Metro/issues/1835) Window animation interferes with WindowsFormsHost positioning
+- [#2917](https://github.com/MahApps/MahApps.Metro/pull/2917) Hamburger Header Templating
+- [#2332](https://github.com/MahApps/MahApps.Metro/issues/2332) Calendar ignores IsTodayHighlighted property
+- [#2434](https://github.com/MahApps/MahApps.Metro/issues/2434) DataGridNumericUpDownColumn foreground color
+- [#2627](https://github.com/MahApps/MahApps.Metro/issues/2627) Inconsistent FloatingWatermark Alignment
+- [#2865](https://github.com/MahApps/MahApps.Metro/issues/2865) [Feature request]Enable/Disable of Hamburger Menu Item
+- [#2880](https://github.com/MahApps/MahApps.Metro/issues/2880) RangeSlider: Inadequate snapping to ticks
+- [#2812](https://github.com/MahApps/MahApps.Metro/issues/2812) Font family in Flyout.xaml and MetroNavigationWindow.xaml
+- [#2764](https://github.com/MahApps/MahApps.Metro/issues/2764) Flyout - Border not shown
+- [#2515](https://github.com/MahApps/MahApps.Metro/issues/2515) NumericUpDown Value not displayed
+- [#1929](https://github.com/MahApps/MahApps.Metro/issues/1929) MetroDataGridCheckBox style prevents the CellEditEnding

readme.md

@@ -11,8 +11,8 @@ A toolkit for creating metro-style WPF applications. Lots of goodness out-of-the
 [![NuGetPre](https://img.shields.io/nuget/vpre/MahApps.Metro.svg?style=flat-square)](https://www.nuget.org/packages/MahApps.Metro/)
 [![Issues](https://img.shields.io/github/issues/MahApps/MahApps.Metro.svg?style=flat-square)](https://github.com/MahApps/MahApps.Metro/issues)
 
-[![TeamCity](https://img.shields.io/teamcity/http/builds.brendanforster.com/s/MahApps_MahAppsMetroDevelopAlpha.svg?style=flat-square&&label=TeamCity%20dev)]()
-[![TeamCity](https://img.shields.io/teamcity/http/builds.brendanforster.com/s/MahApps_MahAppsMetroPullRequests.svg?style=flat-square&&label=TeamCity%20PRs)]()
+[![TeamCity](https://img.shields.io/teamcity/http/builds.brendanforster.com/s/MahApps_MahAppsMetroDevelopAlpha.svg?style=flat-square&&label=TeamCity%20dev)](http://builds.brendanforster.com/viewType.html?buildTypeId=MahApps_MahAppsMetroDevelopAlpha)
+[![TeamCity](https://img.shields.io/teamcity/http/builds.brendanforster.com/s/MahApps_MahAppsMetroPullRequests.svg?style=flat-square&&label=TeamCity%20PRs)](http://builds.brendanforster.com/viewType.html?buildTypeId=MahApps_MahAppsMetroPullRequests)
 
 ## Want to say thanks?
 

src/.paket/paket.exe

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>MahApps.Metro</id>
-    <version>1.4.3.0</version>
+    <version>1.5.0.0</version>
     <title>MahApps.Metro</title>
     <authors>Jan Karger, Dennis Daume, Brendan Forster, Paul Jenkins, Jake Ginnivan, Alex Mitchell</authors>
     <owners>punker76,shiftkey,aeoth,jakeginnivan</owners>

src/MahApps.Metro.Build/MahApps.Metro.nuspec

@@ -126,13 +126,13 @@
     </When>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Caliburn.Micro.Platform.Core">
-          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
+        <Reference Include="Caliburn.Micro.Platform">
+          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="Caliburn.Micro.Platform">
-          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
+        <Reference Include="Caliburn.Micro.Platform.Core">
+          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -231,8 +231,8 @@
         <Reference Include="System.Net">
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
-          <HintPath>..\..\..\packages\Microsoft.Bcl.Async\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
+        <Reference Include="Microsoft.Threading.Tasks">
+          <HintPath>..\..\..\packages\Microsoft.Bcl.Async\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
@@ -241,8 +241,8 @@
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="Microsoft.Threading.Tasks">
-          <HintPath>..\..\..\packages\Microsoft.Bcl.Async\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
+        <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
+          <HintPath>..\..\..\packages\Microsoft.Bcl.Async\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>

src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET40/MahApps.Metro.Caliburn.Demo.NET40.csproj

@@ -124,13 +124,13 @@
     </When>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3')">
       <ItemGroup>
-        <Reference Include="Caliburn.Micro.Platform.Core">
-          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
+        <Reference Include="Caliburn.Micro.Platform">
+          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
-        <Reference Include="Caliburn.Micro.Platform">
-          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
+        <Reference Include="Caliburn.Micro.Platform.Core">
+          <HintPath>..\..\..\packages\Caliburn.Micro\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>

src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.NET45/MahApps.Metro.Caliburn.Demo.NET45.csproj

@@ -1,5 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />

src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.Shared/Resources/Theme1.xaml

@@ -4,9 +4,9 @@
              xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
              d:DesignHeight="300"
-             d:DesignWidth="300">
+             d:DesignWidth="300"
+             mc:Ignorable="d">
 
     <Grid Margin="24">
         <Grid.RowDefinitions>
@@ -19,22 +19,22 @@
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <StackPanel Orientation="Vertical">
                 <TextBox Controls:TextBoxHelper.Watermark="TextBox 01" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 02" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 03" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 04" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 05" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 06" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 07" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 08" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 09" />
-                <TextBox Margin="0,5,0,0" Controls:TextBoxHelper.Watermark="TextBox 10" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 02" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 03" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 04" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 05" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 06" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 07" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 08" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 09" />
+                <TextBox Margin="0 5 0 0" Controls:TextBoxHelper.Watermark="TextBox 10" />
             </StackPanel>
         </ScrollViewer>
 
         <StackPanel Grid.Row="2"
-                    Margin="0,5,0,0"
+                    Margin="0 5 0 0"
                     Orientation="Horizontal">
-            <Button Margin="0,0,10,0" Content="create" />
+            <Button Margin="0 0 10 0" Content="create" />
             <Button Content="cancel" />
         </StackPanel>
 

src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.Shared/Views/Flyouts/Flyout1View.xaml

@@ -3,9 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d"
              d:DesignHeight="300"
-             d:DesignWidth="300">
+             d:DesignWidth="300"
+             mc:Ignorable="d">
 
     <StackPanel Orientation="Vertical">
         <Button Content="create" />

src/MahApps.Metro.Samples/MahApps.Metro.Caliburn.Demo/MahApps.Metro.Caliburn.Demo.Shared/Views/Flyouts/Flyout2View.xaml

@@ -4,9 +4,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              Width="250"
-             mc:Ignorable="d"
              d:DesignHeight="300"
-             d:DesignWidth="300">
+             d:DesignWidth="300"
+             mc:Ignorable="d">
 
     <UserControl.Resources>
         <ResourceDictionary>