From ca81230f84cb5e711daab936d8cf8e63e107b5e0 Mon Sep 17 00:00:00 2001
From: Yuki <yuuki.walsh@outlook.com>
Date: Sat, 5 Nov 2022 17:13:11 +1100
Subject: [PATCH] GroupBox styles updated

---
 Styles.xaml                    |  4 +++
 Styles/BorderStyles.xaml       |  2 +-
 Styles/ButtonStyles.xaml       | 10 +++---
 Styles/CheckBoxStyles.xaml     |  2 +-
 Styles/GroupBoxStyles.xaml     | 63 +---------------------------------
 Styles/TabControlStyles.xaml   |  2 +-
 Styles/ToggleButtonStyles.xaml |  2 +-
 7 files changed, 14 insertions(+), 71 deletions(-)

diff --git a/Styles.xaml b/Styles.xaml
index 2bdb95b..d7970ea 100644
--- a/Styles.xaml
+++ b/Styles.xaml
@@ -77,6 +77,10 @@
 		BasedOn="{StaticResource XivToolsMenuItem}"
 		TargetType="{x:Type MenuItem}" />
 
+	<Style
+		BasedOn="{StaticResource XivToolsGroupBox}"
+		TargetType="{x:Type GroupBox}" />
+
 	<BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 
 	<!--  Custom converters  -->
diff --git a/Styles/BorderStyles.xaml b/Styles/BorderStyles.xaml
index 273ec74..3a80f1e 100644
--- a/Styles/BorderStyles.xaml
+++ b/Styles/BorderStyles.xaml
@@ -3,7 +3,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
 	<Style
-		x:Key="Panel"
+		x:Key="XivToolsControlHoverBorder"
 		TargetType="{x:Type Border}">
 		<Setter Property="Background" Value="#11FFFFFF" />
 		<Setter Property="BorderThickness" Value="1" />
diff --git a/Styles/ButtonStyles.xaml b/Styles/ButtonStyles.xaml
index 7e0286f..4141eb6 100644
--- a/Styles/ButtonStyles.xaml
+++ b/Styles/ButtonStyles.xaml
@@ -29,7 +29,7 @@
 						<Border
 							x:Name="HoverBorder"
 							Opacity="0"
-							Style="{DynamicResource Panel}" />
+							Style="{StaticResource XivToolsControlHoverBorder}" />
 
 						<Border
 							x:Name="Border"
@@ -91,7 +91,7 @@
 						<Border
 							x:Name="HoverBorder"
 							Opacity="0"
-							Style="{DynamicResource Panel}" />
+							Style="{StaticResource XivToolsControlHoverBorder}" />
 
 						<ContentPresenter
 							Margin="0,6,6,6"
@@ -135,7 +135,7 @@
 						<Border
 							x:Name="HoverBorder"
 							Opacity="0"
-							Style="{DynamicResource Panel}" />
+							Style="{StaticResource XivToolsControlHoverBorder}" />
 
 						<Border
 							x:Name="Border"
@@ -245,7 +245,7 @@
 						<Border
 							x:Name="HoverBorder"
 							Opacity="0"
-							Style="{DynamicResource Panel}" />
+							Style="{StaticResource XivToolsControlHoverBorder}" />
 
 						<ContentPresenter
 							x:Name="ContentRipple"
@@ -311,7 +311,7 @@
 							x:Name="HoverBorder"
 							Margin="1"
 							Opacity="0"
-							Style="{DynamicResource Panel}" />
+							Style="{StaticResource XivToolsControlHoverBorder}" />
 
 						<!--<Line X1="0" X2="1" Stretch="Fill" x:Name="Border" StrokeThickness="{TemplateBinding BorderThickness}" Stroke="{TemplateBinding BorderBrush}" VerticalAlignment="Bottom" Margin="3, 0, 3, 0"/>-->
 
diff --git a/Styles/CheckBoxStyles.xaml b/Styles/CheckBoxStyles.xaml
index 54d4f6a..5f29212 100644
--- a/Styles/CheckBoxStyles.xaml
+++ b/Styles/CheckBoxStyles.xaml
@@ -31,7 +31,7 @@
 					BorderThickness="1"
 					CornerRadius="6,0,0,6"
 					Opacity="0"
-					Style="{DynamicResource Panel}" />
+					Style="{StaticResource XivToolsControlHoverBorder}" />
 
 				<controls:IconBlock
 					x:Name="CheckMark"
diff --git a/Styles/GroupBoxStyles.xaml b/Styles/GroupBoxStyles.xaml
index be6ac2d..0993d33 100644
--- a/Styles/GroupBoxStyles.xaml
+++ b/Styles/GroupBoxStyles.xaml
@@ -4,7 +4,7 @@
 	xmlns:local="clr-namespace:XivToolsWpf">
 
 	<Style
-		x:Key="Cm3GroupBox"
+		x:Key="XivToolsGroupBox"
 		TargetType="{x:Type GroupBox}">
 		<Setter Property="Foreground" Value="{DynamicResource ForegroundLightBrush}" />
 		<Setter Property="FontWeight" Value="Normal" />
@@ -72,65 +72,4 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-
-	<Style
-		BasedOn="{StaticResource Cm3GroupBox}"
-		TargetType="{x:Type GroupBox}" />
-
-	<Style
-		x:Key="PanelGroupBox"
-		BasedOn="{StaticResource Cm3GroupBox}"
-		TargetType="{x:Type GroupBox}">
-
-		<Setter Property="Padding" Value="3" />
-		<Setter Property="Margin" Value="0" />
-
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type GroupBox}">
-					<Border
-						Grid.Column="0"
-						Margin="3"
-						Style="{DynamicResource Panel}">
-						<Grid Margin="3">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="15" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-
-							<ContentPresenter
-								Grid.Row="0"
-								Grid.Column="0"
-								Margin="0"
-								ContentSource="Header"
-								ContentStringFormat="{TemplateBinding HeaderStringFormat}"
-								ContentTemplate="{TemplateBinding HeaderTemplate}"
-								ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
-								RecognizesAccessKey="True" />
-
-							<Border
-								Grid.Row="1"
-								Grid.ColumnSpan="2"
-								Margin="0"
-								Background="{TemplateBinding Background}"
-								BorderThickness="0"
-								CornerRadius="3">
-								<ContentPresenter
-									Grid.Row="1"
-									Margin="{TemplateBinding Padding}"
-									ContentStringFormat="{TemplateBinding ContentStringFormat}"
-									ContentTemplate="{TemplateBinding ContentTemplate}"
-									ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-							</Border>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Styles/TabControlStyles.xaml b/Styles/TabControlStyles.xaml
index 23bd119..6813cb0 100644
--- a/Styles/TabControlStyles.xaml
+++ b/Styles/TabControlStyles.xaml
@@ -124,7 +124,7 @@
 							x:Name="HoverBorder"
 							Opacity="0"
 							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-							Style="{DynamicResource Panel}" />
+							Style="{StaticResource XivToolsControlHoverBorder}" />
 
 						<ContentPresenter
 							x:Name="ContentSite"
diff --git a/Styles/ToggleButtonStyles.xaml b/Styles/ToggleButtonStyles.xaml
index 47270ff..2c932dc 100644
--- a/Styles/ToggleButtonStyles.xaml
+++ b/Styles/ToggleButtonStyles.xaml
@@ -150,7 +150,7 @@
 				Margin="1"
 				Opacity="0"
 				SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-				Style="{DynamicResource Panel}" />
+				Style="{StaticResource XivToolsControlHoverBorder}" />
 
 			<Border
 				x:Name="Border"