Skip to content

Portable Tool for an Ideal Windows Setup

upd. refine shadows transparency across themes

Greedeks7f8242443e32
diff --git a/.Source/GTweak/Styles/Buttons/RadioButtons.xaml b/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
index a60fcd7d..b7267596 100644
--- a/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
+++ b/.Source/GTweak/Styles/Buttons/RadioButtons.xaml
@@ -29,7 +29,7 @@
</Border>
<Border x:Name="InnerPanel" Height="48" CornerRadius="12" Background="{TemplateBinding Background}" HorizontalAlignment="Left" VerticalAlignment="Center" Padding="0,0,10,0">
<Grid Height="48">
- <Rectangle x:Name="ContentShadowMask" Grid.ColumnSpan="2" Fill="#33000000" Opacity="0.7" IsHitTestVisible="False">
+ <Rectangle x:Name="ContentShadowMask" Grid.ColumnSpan="2" Fill="#33000000" Opacity="{StaticResource IconNavigation_Opacity}" IsHitTestVisible="False">
<Rectangle.RenderTransform>
<TranslateTransform X="3" Y="3" />
</Rectangle.RenderTransform>
@@ -59,7 +59,7 @@
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="InnerPanel" Property="Background" Value="{StaticResource Brush_BtnBG_Navigation}"/>
<Setter Property="Foreground" Value="{StaticResource Brush_Accent}"/>
- <Setter TargetName="ShadowPanel" Property="Opacity" Value="0.8"/>
+ <Setter TargetName="ShadowPanel" Property="Opacity" Value="0.7"/>
<Trigger.EnterActions>
<BeginStoryboard>
<Storyboard Timeline.DesiredFrameRate="120">
@@ -117,7 +117,7 @@
<Setter TargetName="InnerPanel" Property="Background" Value="{StaticResource Brush_BtnBG_Navigation}"/>
<Setter Property="Foreground" Value="{StaticResource Brush_Accent}"/>
<Setter TargetName="NavTextBox" Property="Opacity" Value="1"/>
- <Setter TargetName="ShadowPanel" Property="Opacity" Value="0.8"/>
+ <Setter TargetName="ShadowPanel" Property="Opacity" Value="0.7"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
diff --git a/.Source/GTweak/Styles/Buttons/ToggleButtons.xaml b/.Source/GTweak/Styles/Buttons/ToggleButtons.xaml
index 2be3fc08..2cc11eb4 100644
--- a/.Source/GTweak/Styles/Buttons/ToggleButtons.xaml
+++ b/.Source/GTweak/Styles/Buttons/ToggleButtons.xaml
@@ -349,7 +349,7 @@
<Setter TargetName="BackgroundBorder" Property="Background" Value="{StaticResource Brush_Button}"/>
</Trigger>
<Trigger Property="IsChecked" Value="False">
- <Setter TargetName="Icon" Property="Opacity" Value="{StaticResource UncheckedIconOpacity}"/>
+ <Setter TargetName="Icon" Property="Opacity" Value="{StaticResource IconAppUnchecked_Opacity}"/>
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="Icon" Property="Opacity" Value="1"/>
diff --git a/.Source/GTweak/Styles/Themes/Dark/Colors.xaml b/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
index 8f1f5f8c..693da321 100644
--- a/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
+++ b/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
@@ -56,8 +56,9 @@
<Color x:Key="Color_Border_Hover_CheckBox">#9B9C9C</Color>
<Color x:Key="Color_Background_CheckBox">#40C279</Color>
-
- <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="UncheckedIconOpacity">0.1</sys:Double>
- <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="RadialProgressOpacity">0.2</sys:Double>
+
+ <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="IconAppUnchecked_Opacity">0.1</sys:Double>
+ <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="RadialProgress_Opacity">0.2</sys:Double>
+ <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="IconNavigation_Opacity">0.7</sys:Double>
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Themes/Light/Colors.xaml b/.Source/GTweak/Styles/Themes/Light/Colors.xaml
index 4ad930f6..84dd348b 100644
--- a/.Source/GTweak/Styles/Themes/Light/Colors.xaml
+++ b/.Source/GTweak/Styles/Themes/Light/Colors.xaml
@@ -56,8 +56,8 @@
<Color x:Key="Color_Border_Hover_CheckBox">#929292</Color>
<Color x:Key="Color_Background_CheckBox">#00A15A</Color>
-
- <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="UncheckedIconOpacity">0.25</sys:Double>
- <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="RadialProgressOpacity">0.3</sys:Double>
-
+
+ <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="IconAppUnchecked_Opacity">0.25</sys:Double>
+ <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="RadialProgress_Opacity">0.3</sys:Double>
+ <sys:Double xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Key="IconNavigation_Opacity">0.3</sys:Double>
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/View/DataSystemView.xaml b/.Source/GTweak/View/DataSystemView.xaml
index 6713c535..a45d952c 100644
--- a/.Source/GTweak/View/DataSystemView.xaml
+++ b/.Source/GTweak/View/DataSystemView.xaml
@@ -37,7 +37,7 @@
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,2,10,0">
- <Ellipse Height="90" Width="90" Stroke="{StaticResource Brush_Separator}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="{StaticResource RadialProgressOpacity}">
+ <Ellipse Height="90" Width="90" Stroke="{StaticResource Brush_Separator}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="{StaticResource RadialProgress_Opacity}">
<Ellipse.CacheMode>
<BitmapCache RenderAtScale="2" EnableClearType="True"/>
</Ellipse.CacheMode>
@@ -97,7 +97,7 @@
</uc:FlowPanel>
<Grid Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,2,15,0">
- <Ellipse Height="90" Width="90" Stroke="{StaticResource Brush_Separator}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="{StaticResource RadialProgressOpacity}">
+ <Ellipse Height="90" Width="90" Stroke="{StaticResource Brush_Separator}" StrokeThickness="4.5" VerticalAlignment="Center" HorizontalAlignment="Center" Opacity="{StaticResource RadialProgress_Opacity}">
<Ellipse.CacheMode>
<BitmapCache RenderAtScale="2" EnableClearType="True"/>
</Ellipse.CacheMode>