Renaming GlassBorderThickness to GlassFrameThickness as part of #209

fluentribbon · Dec 13, 2015 · 665541c · 665541c
1 parent 1f826d4
commit 665541c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/Fluent/Controls/RibbonWindow.cs b/Fluent/Controls/RibbonWindow.cs
@@ -78,17 +78,17 @@ public Thickness ResizeBorderThickness
         /// <summary>
         /// Gets or sets glass border thickness
         /// </summary>
-        public Thickness GlassBorderThickness
+        public Thickness GlassFrameThickness
         {
-            get { return (Thickness)this.GetValue(GlassBorderThicknessProperty); }
-            set { this.SetValue(GlassBorderThicknessProperty, value); }
+            get { return (Thickness)this.GetValue(GlassFrameThicknessProperty); }
+            set { this.SetValue(GlassFrameThicknessProperty, value); }
         }
 
         /// <summary>
-        /// Using a DependencyProperty as the backing store for GlassBorderThickness.  This enables animation, styling, binding, etc...
+        /// Using a DependencyProperty as the backing store for GlassFrameThickness.  This enables animation, styling, binding, etc...
         /// </summary>
-        public static readonly DependencyProperty GlassBorderThicknessProperty =
-            DependencyProperty.Register("GlassBorderThickness", typeof(Thickness), typeof(RibbonWindow), new UIPropertyMetadata(new Thickness(0D), OnWindowChromeRelevantPropertyChanged));
+        public static readonly DependencyProperty GlassFrameThicknessProperty =
+            DependencyProperty.Register("GlassFrameThickness", typeof(Thickness), typeof(RibbonWindow), new UIPropertyMetadata(new Thickness(0D), OnWindowChromeRelevantPropertyChanged));
 
         /// <summary>
         /// Gets or sets corner radius 
@@ -247,7 +247,7 @@ protected virtual void InitializeWindowChromeBehavior()
             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.GlassFrameThicknessProperty, new Binding { Path = new PropertyPath(GlassFrameThicknessProperty), Source = this });
             BindingOperations.SetBinding(behavior, WindowChromeBehavior.UseAeroCaptionButtonsProperty, new Binding { Path = new PropertyPath(CanUseDwmProperty), Source = this });
             Interaction.GetBehaviors(this).Add(behavior);
         }

diff --git a/Fluent/Themes/Office2010/RibbonWindow.xaml b/Fluent/Themes/Office2010/RibbonWindow.xaml
@@ -175,7 +175,7 @@
 
                     <Grid x:Name="grid"
                           Background="{TemplateBinding Background}"
-                          Margin="{TemplateBinding GlassBorderThickness}" />
+                          Margin="{TemplateBinding GlassFrameThickness}" />
 
                     <StackPanel Background="Transparent"
                                 x:Name="PART_IconImage"
@@ -690,7 +690,7 @@
            TargetType="{x:Type Fluent:RibbonWindow}">
         <Setter Property="OverridesDefaultStyle"
                 Value="True" />
-        <Setter Property="GlassBorderThickness">
+        <Setter Property="GlassFrameThickness">
             <Setter.Value>
                 <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}"
                               ConverterParameter="0">
@@ -720,7 +720,7 @@
                     <Condition Property="CanUseDwm"
                                Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="GlassBorderThickness">
+                <Setter Property="GlassFrameThickness">
                     <Setter.Value>
                         <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
                             <Binding RelativeSource="{RelativeSource Self}"
@@ -741,15 +741,15 @@
                     <Condition Property="CanUseDwm"
                                Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="GlassBorderThickness"
+                <Setter Property="GlassFrameThickness"
                         Value="0,50,0,0" />
             </MultiTrigger>
             <Trigger Property="CanUseDwm"
                      Value="False">
                 <Setter Property="Template"
                         Value="{DynamicResource NonDwmRibbonWindowControlTemplate}" />
-                <!-- Cheat with GlassBorderThickness. We have to set something else than 0 to avoid some bugs in the WindowChrome class. -->
-                <Setter Property="GlassBorderThickness"
+                <!-- Cheat with GlassFrameThickness. We have to set something else than 0 to avoid some bugs in the WindowChrome class. -->
+                <Setter Property="GlassFrameThickness"
                         Value="0,0,0,1" />
             </Trigger>
             <Trigger Property="CanUseDwm"

diff --git a/Fluent/Themes/Office2013/RibbonWindow.xaml b/Fluent/Themes/Office2013/RibbonWindow.xaml
@@ -280,8 +280,8 @@
                 Value="True" />           
         <Setter Property="BorderThickness"
                 Value="0" />
-        <!-- Cheat with GlassBorderThickness. We have to set something else than 0 to avoid some bugs in the WindowChrome class. -->
-        <Setter Property="GlassBorderThickness"
+        <!-- Cheat with GlassFrameThickness. We have to set something else than 0 to avoid some bugs in the WindowChrome class. -->
+        <Setter Property="GlassFrameThickness"
                 Value="0,0,0,1" />
         <Setter Property="DontUseDwm"
                 Value="True" />

diff --git a/Fluent/Themes/Windows8/RibbonWindow.xaml b/Fluent/Themes/Windows8/RibbonWindow.xaml
@@ -142,7 +142,7 @@
 
                     <Grid x:Name="grid"
                           Background="{TemplateBinding Background}"
-                          Margin="{TemplateBinding GlassBorderThickness}" />
+                          Margin="{TemplateBinding GlassFrameThickness}" />
 
                     <StackPanel Background="Transparent"
                                 x:Name="PART_IconImage"
@@ -647,7 +647,7 @@
            TargetType="{x:Type Fluent:RibbonWindow}">
         <Setter Property="OverridesDefaultStyle"
                 Value="True" />
-        <Setter Property="GlassBorderThickness">
+        <Setter Property="GlassFrameThickness">
             <Setter.Value>
                 <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
                     <Binding RelativeSource="{RelativeSource Self}"
@@ -672,7 +672,7 @@
                     <Condition Property="CanUseDwm"
                                Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="GlassBorderThickness">
+                <Setter Property="GlassFrameThickness">
                     <Setter.Value>
                         <MultiBinding Converter="{x:Static Converters:StaticConverters.ThicknessConverter}">
                             <Binding RelativeSource="{RelativeSource Self}"
@@ -693,15 +693,15 @@
                     <Condition Property="CanUseDwm"
                                Value="True" />
                 </MultiTrigger.Conditions>
-                <Setter Property="GlassBorderThickness"
+                <Setter Property="GlassFrameThickness"
                         Value="0,50,0,0" />
             </MultiTrigger>
             <Trigger Property="CanUseDwm"
                      Value="False">
                 <Setter Property="Template"
                         Value="{DynamicResource NonDwmRibbonWindowControlTemplate}" />
-                <!-- Cheat with GlassBorderThickness. We have to set something else than 0 to avoid some bugs in the WindowChrome class. -->
-                <Setter Property="GlassBorderThickness"
+                <!-- Cheat with GlassFrameThickness. We have to set something else than 0 to avoid some bugs in the WindowChrome class. -->
+                <Setter Property="GlassFrameThickness"
                         Value="0,0,0,1" />
             </Trigger>
             <Trigger Property="CanUseDwm"