- Fixes #196 by removing WindowSettingBehavior and WindowSettings

- Changing usage of WindowChromeBehavior to code behind instead of style
fluentribbon · Dec 13, 2015 · 27394c2 · 27394c2
1 parent fbcb63a
commit 27394c2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 229 deletions.
diff --git a/Fluent/Controls/RibbonWindow.cs b/Fluent/Controls/RibbonWindow.cs
@@ -253,13 +253,13 @@ protected override void OnSourceInitialized(EventArgs e)
 
         protected virtual void InitializeWindowChromeBehavior()
         {
-            //var behavior = new WindowChromeBehavior();
-            //BindingOperations.SetBinding(behavior, WindowChromeBehavior.CaptionHeightProperty, new Binding { Path = new PropertyPath(RibbonProperties.TitleBarHeightProperty), Source = this });
-            //BindingOperations.SetBinding(behavior, WindowChromeBehavior.ResizeBorderThicknessProperty, new Binding { Path = new PropertyPath(ResizeBorderThicknessProperty), Source = this });
-            //BindingOperations.SetBinding(behavior, WindowChromeBehavior.CornerRadiusProperty, new Binding { Path = new PropertyPath(CornerRadiusProperty), Source = this });
-            //BindingOperations.SetBinding(behavior, WindowChromeBehavior.GlassFrameThicknessProperty, new Binding { Path = new PropertyPath(GlassBorderThicknessProperty), Source = this });
-            //BindingOperations.SetBinding(behavior, WindowChromeBehavior.UseAeroCaptionButtonsProperty, new Binding { Path = new PropertyPath(CanUseDwmProperty), Source = this });
-            //Interaction.GetBehaviors(this).Add(behavior);
+            var behavior = new WindowChromeBehavior();
+            BindingOperations.SetBinding(behavior, WindowChromeBehavior.CaptionHeightProperty, new Binding { Path = new PropertyPath(RibbonProperties.TitleBarHeightProperty), Source = this });
+            BindingOperations.SetBinding(behavior, WindowChromeBehavior.ResizeBorderThicknessProperty, new Binding { Path = new PropertyPath(ResizeBorderThicknessProperty), Source = this });
+            BindingOperations.SetBinding(behavior, WindowChromeBehavior.CornerRadiusProperty, new Binding { Path = new PropertyPath(CornerRadiusProperty), Source = this });
+            BindingOperations.SetBinding(behavior, WindowChromeBehavior.GlassFrameThicknessProperty, new Binding { Path = new PropertyPath(GlassBorderThicknessProperty), Source = this });
+            BindingOperations.SetBinding(behavior, WindowChromeBehavior.UseAeroCaptionButtonsProperty, new Binding { Path = new PropertyPath(CanUseDwmProperty), Source = this });
+            Interaction.GetBehaviors(this).Add(behavior);
         }
 
         /// <summary>

diff --git a/Fluent/Fluent dotNET 4.0.csproj b/Fluent/Fluent dotNET 4.0.csproj
@@ -119,8 +119,6 @@
     <Compile Include="RibbonCommands.cs" />
     <Compile Include="Metro\Behaviours\StylizedBehaviors.cs" />
     <Compile Include="Metro\Behaviours\StylizedBehaviorsCollection.cs" />
-    <Compile Include="Metro\Behaviours\WindowSettingBehavior.cs" />
-    <Compile Include="Metro\Controls\WindowSettings.cs" />
     <Compile Include="Metro\Native\Constants.cs" />
     <Compile Include="Metro\Native\CREATESTRUCT.cs" />
     <Compile Include="Metro\Native\MARGINS.cs" />
@@ -764,9 +762,7 @@
     <None Include="Themes\Office2013\Generic.txt" />
     <None Include="Themes\XamlCombine.exe" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Metro\Converters\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <None Include="Themes\Windows8\Generic.txt" />
   </ItemGroup>

diff --git a/Fluent/Fluent dotNET 4.5.csproj b/Fluent/Fluent dotNET 4.5.csproj
@@ -119,8 +119,6 @@
     <Compile Include="RibbonCommands.cs" />
     <Compile Include="Metro\Behaviours\StylizedBehaviors.cs" />
     <Compile Include="Metro\Behaviours\StylizedBehaviorsCollection.cs" />
-    <Compile Include="Metro\Behaviours\WindowSettingBehavior.cs" />
-    <Compile Include="Metro\Controls\WindowSettings.cs" />
     <Compile Include="Metro\Native\Constants.cs" />
     <Compile Include="Metro\Native\CREATESTRUCT.cs" />
     <Compile Include="Metro\Native\MARGINS.cs" />
@@ -764,9 +762,7 @@
     <None Include="Themes\Office2013\Generic.txt" />
     <None Include="Themes\XamlCombine.exe" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Metro\Converters\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <None Include="Themes\Windows8\Generic.txt" />
   </ItemGroup>

diff --git a/Fluent/Metro/Behaviours/WindowSettingBehavior.cs b/Fluent/Metro/Behaviours/WindowSettingBehavior.cs
diff --git a/Fluent/Metro/Controls/WindowSettings.cs b/Fluent/Metro/Controls/WindowSettings.cs
diff --git a/Fluent/Properties/AssemblyInfo.cs b/Fluent/Properties/AssemblyInfo.cs
@@ -19,5 +19,4 @@
 [assembly: XmlnsPrefix("urn:fluent-ribbon", "fluent")]
 [assembly: XmlnsDefinition("urn:fluent-ribbon", "Fluent")]
 [assembly: XmlnsDefinition("urn:fluent-ribbon", "Fluent.Converters")]
-[assembly: XmlnsDefinition("urn:fluent-ribbon", "Fluent.Metro.Behaviours")]
-[assembly: XmlnsDefinition("urn:fluent-ribbon", "Fluent.Metro.Controls")]
+[assembly: XmlnsDefinition("urn:fluent-ribbon", "Fluent.Metro.Behaviours")]
diff --git a/Fluent/Themes/Office2010/RibbonWindow.xaml b/Fluent/Themes/Office2010/RibbonWindow.xaml
@@ -6,7 +6,7 @@
                     xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:Fluent="clr-namespace:Fluent"
-                    xmlns:Behaviours="clr-namespace:Fluent.Metro.Behaviours"
+                    xmlns:Converters="clr-namespace:Fluent.Converters"
                     xmlns:ControlzBehaviors="clr-namespace:ControlzEx.Behaviours;assembly=ControlzEx">
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <Fluent:IconConverter x:Key="IconConvert" />
@@ -713,18 +713,6 @@
                 Value="#FF000000" />
         <Setter Property="Background"
                 Value="{DynamicResource WindowBackgroundBrush}" />
-        <Setter Property="Behaviours:StylizedBehaviors.Behaviors">
-            <Setter.Value>
-                <Behaviours:StylizedBehaviorCollection>
-                    <ControlzBehaviors:WindowChromeBehavior CaptionHeight="{Binding Path=(Fluent:RibbonProperties.TitleBarHeight), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                ResizeBorderThickness="{Binding ResizeBorderThickness, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                GlassFrameThickness="{Binding GlassBorderThickness, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                UseAeroCaptionButtons="{Binding CanUseDwm, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}" />
-                    <Behaviours:WindowsSettingBehavior />
-                </Behaviours:StylizedBehaviorCollection>
-            </Setter.Value>
-        </Setter>
         <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>

diff --git a/Fluent/Themes/Office2013/RibbonWindow.xaml b/Fluent/Themes/Office2013/RibbonWindow.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:Fluent="clr-namespace:Fluent"
-                    xmlns:Behaviours="clr-namespace:Fluent.Metro.Behaviours"
                     xmlns:ControlzBehaviors="clr-namespace:ControlzEx.Behaviours;assembly=ControlzEx"
                     xmlns:internal="clr-namespace:Fluent.Internal"
                     xmlns:Converters="clr-namespace:Fluent.Converters">
@@ -296,18 +295,6 @@
                 <SolidColorBrush Color="{DynamicResource WhiteColor}" />
             </Setter.Value>
         </Setter>
-        <Setter Property="Behaviours:StylizedBehaviors.Behaviors">
-            <Setter.Value>
-                <Behaviours:StylizedBehaviorCollection>
-                    <ControlzBehaviors:WindowChromeBehavior CaptionHeight="{Binding Path=(Fluent:RibbonProperties.TitleBarHeight), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                ResizeBorderThickness="{Binding ResizeBorderThickness, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                GlassFrameThickness="{Binding GlassBorderThickness, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                UseAeroCaptionButtons="{Binding CanUseDwm, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}" />
-                    <Behaviours:WindowsSettingBehavior />
-                </Behaviours:StylizedBehaviorCollection>
-            </Setter.Value>
-        </Setter>
         <Setter Property="Template"
                 Value="{StaticResource RibbonWindowControlTemplate}" />
         <Style.Triggers>

diff --git a/Fluent/Themes/Windows8/RibbonWindow.xaml b/Fluent/Themes/Windows8/RibbonWindow.xaml
@@ -6,7 +6,7 @@
                     xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:System="clr-namespace:System;assembly=mscorlib"
                     xmlns:Fluent="clr-namespace:Fluent"
-                    xmlns:Behaviours="clr-namespace:Fluent.Metro.Behaviours"
+                    xmlns:Converters="clr-namespace:Fluent.Converters"
                     xmlns:ControlzBehaviors="clr-namespace:ControlzEx.Behaviours;assembly=ControlzEx">
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     <Fluent:IconConverter x:Key="IconConvert" />
@@ -673,18 +673,6 @@
                 Value="#FF000000" />
         <Setter Property="Background"
                 Value="{DynamicResource WindowBackgroundBrush}" />
-        <Setter Property="Behaviours:StylizedBehaviors.Behaviors">
-            <Setter.Value>
-                <Behaviours:StylizedBehaviorCollection>
-                    <ControlzBehaviors:WindowChromeBehavior CaptionHeight="{Binding Path=(Fluent:RibbonProperties.TitleBarHeight), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                ResizeBorderThickness="{Binding ResizeBorderThickness, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                GlassFrameThickness="{Binding GlassBorderThickness, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}"
-                                                                UseAeroCaptionButtons="{Binding CanUseDwm, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Fluent:RibbonWindow}}}" />                    
-                    <Behaviours:WindowsSettingBehavior />
-                </Behaviours:StylizedBehaviorCollection>
-            </Setter.Value>
-        </Setter>
         <Style.Triggers>
             <MultiTrigger>
                 <MultiTrigger.Conditions>