Skip to content

Portable Tool for an Ideal Windows Setup

upd anim popup & re

Greedeksa0e05c3334c9
diff --git a/.Source/GTweak/Assets/UserControl/Card.xaml.cs b/.Source/GTweak/Assets/UserControl/Card.xaml.cs
index 3e7041e9..205244ca 100644
--- a/.Source/GTweak/Assets/UserControl/Card.xaml.cs
+++ b/.Source/GTweak/Assets/UserControl/Card.xaml.cs
@@ -38,7 +38,7 @@ namespace GTweak.Assets.UserControl
internal static readonly DependencyProperty TextProperty =
DependencyProperty.Register(nameof(TextBlock), typeof(string), typeof(Card), new PropertyMetadata(string.Empty));
- internal static readonly DependencyProperty ContentProperty =
+ internal static new readonly DependencyProperty ContentProperty =
DependencyProperty.Register(nameof(BtnContent), typeof(string), typeof(Button), new PropertyMetadata(string.Empty, (s, e) => ((Button)s).Content = (string)e.NewValue));
private static void OnIconStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
diff --git a/.Source/GTweak/Converters/ScrollFadeMaskConverter.cs b/.Source/GTweak/Converters/ScrollFadeMaskConverter.cs
index e08f4d91..09c7540f 100644
--- a/.Source/GTweak/Converters/ScrollFadeMaskConverter.cs
+++ b/.Source/GTweak/Converters/ScrollFadeMaskConverter.cs
@@ -3,6 +3,7 @@ using System.Globalization;
using System.Windows;
using System.Windows.Data;
using System.Windows.Media;
+using GTweak.Utilities.Controls;
namespace GTweak.Converters
{
@@ -85,7 +86,8 @@ namespace GTweak.Converters
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
{
- throw new NotImplementedException();
+ ErrorLogging.LogWritingFile(new NotImplementedException());
+ return Array.Empty<object>();
}
}
}
diff --git a/.Source/GTweak/Styles/Inputs/ComboBox.xaml b/.Source/GTweak/Styles/Inputs/ComboBox.xaml
index 0a1d3554..83acd10c 100644
--- a/.Source/GTweak/Styles/Inputs/ComboBox.xaml
+++ b/.Source/GTweak/Styles/Inputs/ComboBox.xaml
@@ -200,14 +200,12 @@
<EventTrigger RoutedEvent="ToggleButton.Checked">
<BeginStoryboard>
<Storyboard Timeline.DesiredFrameRate="120">
- <DoubleAnimation Storyboard.TargetName="PopupBorder" Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:0.15">
+ <DoubleAnimation Storyboard.TargetName="PopupBorder" Storyboard.TargetProperty="Opacity" From="0" To="0.7" Duration="0:0:0.1"/>
+ <DoubleAnimation Storyboard.TargetName="PopupScale" Storyboard.TargetProperty="ScaleY" From="0" To="0.8" Duration="0:0:0.1"/>
+ <DoubleAnimation BeginTime="0:0:0.1" Storyboard.TargetName="PopupBorder" Storyboard.TargetProperty="Opacity" From="0.7" To="1" Duration="0:0:0.15"/>
+ <DoubleAnimation BeginTime="0:0:0.1" Storyboard.TargetName="PopupScale" Storyboard.TargetProperty="ScaleY" From="0.8" To="1" Duration="0:0:0.2">
<DoubleAnimation.EasingFunction>
- <QuadraticEase EasingMode="EaseOut"/>
- </DoubleAnimation.EasingFunction>
- </DoubleAnimation>
- <DoubleAnimation Storyboard.TargetName="PopupScale" Storyboard.TargetProperty="ScaleY" From="0" To="1" Duration="0:0:0.2">
- <DoubleAnimation.EasingFunction>
- <CubicEase EasingMode="EaseOut"/>
+ <BackEase Amplitude="0.3" EasingMode="EaseOut"/>
</DoubleAnimation.EasingFunction>
</DoubleAnimation>
</Storyboard>
diff --git a/.Source/GTweak/Utilities/Helpers/CommandExecutor.cs b/.Source/GTweak/Utilities/Helpers/CommandExecutor.cs
index 4033dc82..4c0a7e3d 100644
--- a/.Source/GTweak/Utilities/Helpers/CommandExecutor.cs
+++ b/.Source/GTweak/Utilities/Helpers/CommandExecutor.cs
@@ -96,10 +96,7 @@ namespace GTweak.Utilities.Helpers
process.Start();
await process.WaitForExitAsync().ConfigureAwait(false);
}
- catch (Exception ex)
- {
- ErrorLogging.LogDebug(ex);
- }
+ catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
internal static Task WaitForExitAsync(this Process process)
diff --git a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
index 95742c1f..872e73d8 100644
--- a/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
+++ b/.Source/GTweak/Utilities/Tweaks/UninstallingPakages.cs
@@ -26,15 +26,7 @@ namespace GTweak.Utilities.Tweaks
{
try
{
- HashSet<string> keys = RegistryHelp.GetSubKeyNames<HashSet<string>>(Registry.CurrentUser, @"Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\Repository\Packages");
- if (keys == null)
- {
- InstalledPackagesCache = new HashSet<string>();
- }
- else
- {
- InstalledPackagesCache = keys;
- }
+ InstalledPackagesCache = RegistryHelp.GetSubKeyNames<HashSet<string>>(Registry.CurrentUser, @"Software\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\Repository\Packages") ?? new HashSet<string>();
}
catch (Exception ex)
{