Merge pull request #1 from MahApps/develop

Catch-up merge
MahApps · May 10, 2017 · 910aa9c · 910aa9c
2 parents 8def9b9 + 461d10b
commit 910aa9c
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 64 deletions.
diff --git a/docs/release-notes/1.6.0.md b/docs/release-notes/1.6.0.md
@@ -2,9 +2,16 @@
 
 ## Features / Changes / Fixes
 
-- Change `IsPaneOpen` property of `HamburgerMenu` to `FrameworkPropertyMetadataOptions.BindsTwoWayByDefault` [#2926](https://github.com/MahApps/MahApps.Metro/issues/2926)
+- Change `IsPaneOpen` property of `HamburgerMenu` to `FrameworkPropertyMetadataOptions.BindsTwoWayByDefault`. [#2926](https://github.com/MahApps/MahApps.Metro/issues/2926)
+- Add ContentStringFormat / ContentTemplateSelector to ContentPresenter of `RadioButton`. [#2954](https://github.com/MahApps/MahApps.Metro/pull/2954) [@pmccowat](https://github.com/pmccowat)
+- Add ContentStringFormat / ContentTemplateSelector to ContentPresenter of `CheckBox`.
 
 ## Closed Issues
 
 - [#2926](https://github.com/MahApps/MahApps.Metro/issues/2926) IsPaneOpen property in Hamburger Menu is not properly set after opening/closing pane
 - [#2933](https://github.com/MahApps/MahApps.Metro/issues/2933) Hamburguer menu issue
+- [#2951](https://github.com/MahApps/MahApps.Metro/issues/2951) Window with showactivated=false and sizetocontent=WidthAndHeight is activated in Mahapps.Metro v1.5
+- [#2958](https://github.com/MahApps/MahApps.Metro/issues/2958) NumericUpDown: If HasDecimals is set to false and StringFormat was bound, HasDecimals will be set to true after unloading and loading the control
+- [#2963](https://github.com/MahApps/MahApps.Metro/issues/2963) WindowCommands with ItemTemplateSelector not working
+- [#2956](https://github.com/MahApps/MahApps.Metro/issues/2956) property ToolTip of ProgressRing does not work
+- [#2938](https://github.com/MahApps/MahApps.Metro/issues/2938) DataGridNumericUpDownColumn StringFormat binding
diff --git a/...les/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SliderProgressExamples.xaml b/...les/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SliderProgressExamples.xaml
@@ -218,7 +218,7 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Controls:ProgressRing Grid.Column="0" Visibility="{Binding MagicToggleButtonIsChecked, Converter={StaticResource BoolToVisibilityConverter}, UpdateSourceTrigger=PropertyChanged}" />
-                <Controls:ProgressRing Grid.Column="1"
+                <Controls:ProgressRing Grid.Column="1" ToolTip="Magic happens!"
                                        Width="40"
                                        Height="40" />
                 <Controls:ProgressRing Grid.Column="2"

diff --git a/src/MahApps.Metro.sln.DotSettings b/src/MahApps.Metro.sln.DotSettings
@@ -86,6 +86,8 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/TagAttributesFormat/@EntryValue">FirstAttributeOnSingleLine</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WrapLimit/@EntryValue">250</s:Int64>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WrapLongLines/@EntryValue">False</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WRAP_LIMIT/@EntryValue">250</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WRAP_LINES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
 &lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
   &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
@@ -759,6 +761,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EXml_002ECodeStyle_002EFormatSettingsUpgrade_002EXmlMoveToCommonFormatterSettingsUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UserInterface/HierarchyView/ViewStyle/@EntryValue">InterfaceLeaves</s:String>
 	<s:Int64 x:Key="/Default/Environment/UserInterface/InspectionResultView/GroupingIndex/@EntryValue">5</s:Int64>
 	<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">Idea</s:String>

diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Behaviours/BorderlessWindowBehavior.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Behaviours/BorderlessWindowBehavior.cs
@@ -474,7 +474,12 @@ private void AssociatedObject_SourceInitialized(object sender, EventArgs e)
                         Native.RECT rect;
                         if (UnsafeNativeMethods.GetWindowRect(this.handle, out rect))
                         {
-                            UnsafeNativeMethods.SetWindowPos(this.handle, new IntPtr(-2), rect.left, rect.top, rect.Width, rect.Height, 0x0040);
+                            uint flags = 0x0040;
+                            if (!this.AssociatedObject.ShowActivated)
+                            {
+                                flags |= (uint)Standard.SWP.NOACTIVATE;
+                            }
+                            UnsafeNativeMethods.SetWindowPos(this.handle, new IntPtr(-2), rect.left, rect.top, rect.Width, rect.Height, flags);
                         }
                     });
             }