Skip to content

Portable Tool for an Ideal Windows Setup

upd. universal class factory animation

Greedeks5bf0b6f81fec
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index ccaf6dd9..9b9b78c0 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -271,7 +271,7 @@
</Compile>
<Compile Include="Utilities\Controls\RunGuard.cs" />
<Compile Include="Utilities\Controls\ErrorLogging.cs" />
- <Compile Include="Utilities\Animation\FadeAnimation.cs" />
+ <Compile Include="Utilities\Animation\FactoryAnimation.cs" />
<Compile Include="Utilities\Controls\PathLocator.cs" />
<Compile Include="Utilities\Helpers\DisablingWinKeys.cs" />
<Compile Include="Utilities\Helpers\CommandExecutor.cs" />
diff --git a/.Source/GTweak/Utilities/Animation/FadeAnimation.cs b/.Source/GTweak/Utilities/Animation/FactoryAnimation.cs
similarity index 74%
rename from .Source/GTweak/Utilities/Animation/FadeAnimation.cs
rename to .Source/GTweak/Utilities/Animation/FactoryAnimation.cs
index 1d6e9748..2387f899 100644
--- a/.Source/GTweak/Utilities/Animation/FadeAnimation.cs
+++ b/.Source/GTweak/Utilities/Animation/FactoryAnimation.cs
@@ -4,13 +4,13 @@ using System.Windows.Media.Animation;
namespace GTweak.Utilities.Animation
{
- internal static class FadeAnimation
+ internal static class FactoryAnimation
{
- internal static DoubleAnimation FadeIn(double toValue, double seconds, Action onCompleted = null, bool reverse = false)
+ internal static DoubleAnimation CreateIn(double fromValue, double toValue, double seconds, Action onCompleted = null, bool reverse = false)
{
DoubleAnimation doubleAnim = new DoubleAnimation()
{
- From = 0,
+ From = fromValue,
To = toValue,
AutoReverse = reverse,
Duration = TimeSpan.FromSeconds(seconds),
@@ -24,7 +24,7 @@ namespace GTweak.Utilities.Animation
return doubleAnim;
}
- internal static DoubleAnimation FadeTo(double seconds, Action onCompleted = null)
+ internal static DoubleAnimation CreateTo(double seconds, Action onCompleted = null)
{
DoubleAnimation doubleAnim = new DoubleAnimation(0, (Duration)TimeSpan.FromSeconds(seconds));
diff --git a/.Source/GTweak/Utilities/Animation/TypewriterAnimation.cs b/.Source/GTweak/Utilities/Animation/TypewriterAnimation.cs
index 4564d64b..729316ed 100644
--- a/.Source/GTweak/Utilities/Animation/TypewriterAnimation.cs
+++ b/.Source/GTweak/Utilities/Animation/TypewriterAnimation.cs
@@ -23,7 +23,7 @@ namespace GTweak.Utilities.Animation
Storyboard.SetTargetProperty(stringAnimation, new PropertyPath(TextBlock.TextProperty));
storyBoard.Children.Add(stringAnimation);
- DoubleAnimation opacityAnimation = FadeAnimation.FadeIn(1, timeSpan.TotalSeconds);
+ DoubleAnimation opacityAnimation = FactoryAnimation.CreateIn(0, 1, timeSpan.TotalSeconds);
Storyboard.SetTargetName(opacityAnimation, textBlock.Name);
Storyboard.SetTargetProperty(opacityAnimation, new PropertyPath(UIElement.OpacityProperty));
storyBoard.Children.Add(opacityAnimation);
diff --git a/.Source/GTweak/Utilities/Configuration/MonitoringService.cs b/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
index eee218c1..15b49b94 100644
--- a/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
+++ b/.Source/GTweak/Utilities/Configuration/MonitoringService.cs
@@ -140,9 +140,7 @@ namespace GTweak.Utilities.Configuration
Task.Run(() =>
{
foreach (var wmiClass in new[] { "Win32_DiskDrive", "MSFT_PhysicalDisk" })
- {
SubscribeToDeviceEvents($"TargetInstance ISA '{wmiClass}'", DeviceType.Storage);
- }
SubscribeToDeviceEvents("TargetInstance ISA 'Win32_SoundDevice'", DeviceType.Audio);
SubscribeToDeviceEvents("TargetInstance ISA 'Win32_NetworkAdapter' AND TargetInstance.NetConnectionStatus IS NOT NULL", DeviceType.Network);
}).ConfigureAwait(false);
diff --git a/.Source/GTweak/View/DataSystemView.xaml.cs b/.Source/GTweak/View/DataSystemView.xaml.cs
index ffc94e2e..1170af52 100644
--- a/.Source/GTweak/View/DataSystemView.xaml.cs
+++ b/.Source/GTweak/View/DataSystemView.xaml.cs
@@ -12,7 +12,6 @@ using System.Windows.Controls.Primitives;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
-using System.Windows.Media.Animation;
using System.Windows.Media.Effects;
using System.Windows.Threading;
@@ -22,6 +21,7 @@ namespace GTweak.View
{
private readonly MonitoringService _monitoringService = new MonitoringService();
private readonly SystemDiagnostics _systemDiagnostics = new SystemDiagnostics();
+ private readonly BackgroundQueue backgroundQueue = new BackgroundQueue();
private readonly TimerControlManager timer = default;
public DataSystemView()
@@ -52,13 +52,11 @@ namespace GTweak.View
{
if ((int)time.TotalSeconds % 2 == 0)
{
- BackgroundQueue backgroundQueue = new BackgroundQueue();
await backgroundQueue.QueueTask(async delegate { await _monitoringService.GetTotalProcessorUsage(); });
AnimationProgressBars();
}
else if ((int)time.TotalSeconds % 5 == 0)
{
- BackgroundQueue backgroundQueue = new BackgroundQueue();
await backgroundQueue.QueueTask(delegate { _systemDiagnostics.GetUserIpAddress(); });
Dispatcher.Invoke(() => DataContext = new DataSystemVM());
}
@@ -66,81 +64,33 @@ namespace GTweak.View
Dispatcher.Invoke(() =>
{
if (BtnHiddenIP.IsChecked.Value & BtnHiddenIP.Visibility == Visibility.Hidden & !SystemDiagnostics.isIPAddressFormatValid)
- {
- DoubleAnimation doubleAnim = new DoubleAnimation(0, (Duration)TimeSpan.FromSeconds(0.18));
- doubleAnim.Completed += delegate { SettingsEngine.IsHiddenIpAddress = false; };
- Timeline.SetDesiredFrameRate(doubleAnim, 240);
- IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);
- }
+ IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, FactoryAnimation.CreateTo(0.18, () => { SettingsEngine.IsHiddenIpAddress = false; }));
});
-
});
timer.Start();
}
- #region Animations
+ private async void OnHandleDevicesEvents(MonitoringService.DeviceType deviceType) => await backgroundQueue.QueueTask(delegate { _systemDiagnostics.UpdatingDevicesData(deviceType); });
+
private void AnimationProgressBars()
{
Dispatcher.Invoke(() =>
{
- DoubleAnimation doubleAnim = new DoubleAnimation()
- {
- From = CPULoad.Value,
- To = MonitoringService.GetProcessorUsage,
- EasingFunction = new QuadraticEase(),
- Duration = TimeSpan.FromSeconds(0.2)
- };
- Timeline.SetDesiredFrameRate(doubleAnim, 240);
- CPULoad.BeginAnimation(ProgressBar.ValueProperty, doubleAnim);
-
- doubleAnim = new DoubleAnimation()
- {
- From = RAMLoad.Value,
- To = _monitoringService.GetMemoryUsage,
- EasingFunction = new QuadraticEase(),
- Duration = TimeSpan.FromSeconds(0.2)
- };
- Timeline.SetDesiredFrameRate(doubleAnim, 240);
- RAMLoad.BeginAnimation(ProgressBar.ValueProperty, doubleAnim);
+ CPULoad.BeginAnimation(ProgressBar.ValueProperty, FactoryAnimation.CreateIn(CPULoad.Value, MonitoringService.GetProcessorUsage, 0.2));
+ RAMLoad.BeginAnimation(ProgressBar.ValueProperty, FactoryAnimation.CreateIn(RAMLoad.Value, _monitoringService.GetMemoryUsage, 0.2));
});
}
private void AnimationPopup()
{
PopupCopy.IsOpen = true;
- CopyTextToastBody.BeginAnimation(UIElement.OpacityProperty, FadeAnimation.FadeIn(0.9, 0.27, () => { PopupCopy.IsOpen = false; }, true));
-
- DoubleAnimation offsetAnim = new DoubleAnimation()
- {
- From = -20,
- To = -50,
- SpeedRatio = 8,
- EasingFunction = new QuadraticEase(),
- Duration = TimeSpan.FromSeconds(3)
- };
- Timeline.SetDesiredFrameRate(offsetAnim, 240);
- PopupCopy.BeginAnimation(Popup.VerticalOffsetProperty, offsetAnim);
+ CopyTextToastBody.BeginAnimation(UIElement.OpacityProperty, FactoryAnimation.CreateIn(0, 0.9, 0.27, () => { PopupCopy.IsOpen = false; }, true));
+ PopupCopy.BeginAnimation(Popup.VerticalOffsetProperty, FactoryAnimation.CreateIn(-20, -50, 0.35));
}
- #endregion
private void BtnHiddenIP_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
SettingsEngine.IsHiddenIpAddress = !BtnHiddenIP.IsChecked.Value;
-
- DoubleAnimation doubleAnim = new DoubleAnimation()
- {
- From = BtnHiddenIP.IsChecked.Value ? 20 : 0,
- To = BtnHiddenIP.IsChecked.Value ? 0 : 20,
- EasingFunction = new QuadraticEase(),
- Duration = TimeSpan.FromSeconds(0.2)
- };
- Timeline.SetDesiredFrameRate(doubleAnim, 240);
- IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, doubleAnim);
- }
-
- private async void OnHandleDevicesEvents(MonitoringService.DeviceType deviceType)
- {
- BackgroundQueue backgroundQueue = new BackgroundQueue();
- await backgroundQueue.QueueTask(delegate { _systemDiagnostics.UpdatingDevicesData(deviceType); });
+ IpAddress.Effect.BeginAnimation(BlurEffect.RadiusProperty, BtnHiddenIP.IsChecked.Value ? FactoryAnimation.CreateTo(0.2) : FactoryAnimation.CreateIn(0, 20, 0.2));
}
private void HandleCopyingData_PreviewMouseDown(object sender, MouseButtonEventArgs e)
diff --git a/.Source/GTweak/View/InterfaceView.xaml b/.Source/GTweak/View/InterfaceView.xaml
index d2689166..1982c4db 100644
--- a/.Source/GTweak/View/InterfaceView.xaml
+++ b/.Source/GTweak/View/InterfaceView.xaml
@@ -87,7 +87,7 @@
<Trigger Property="Visibility" Value="Visible">
<Trigger.EnterActions>
<BeginStoryboard>
- <Storyboard>
+ <Storyboard Timeline.DesiredFrameRate="240">
<DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" Duration="0:0:0.5"/>
</Storyboard>
</BeginStoryboard>
@@ -103,7 +103,7 @@
<Trigger Property="Visibility" Value="Visible">
<Trigger.EnterActions>
<BeginStoryboard>
- <Storyboard Timeline.DesiredFrameRate="400">
+ <Storyboard Timeline.DesiredFrameRate="240">
<DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" RepeatBehavior="Forever" AutoReverse="True" Duration="0:0:0.530" />
</Storyboard>
</BeginStoryboard>
@@ -121,7 +121,7 @@
<Trigger Property="Visibility" Value="Visible">
<Trigger.EnterActions>
<BeginStoryboard>
- <Storyboard>
+ <Storyboard Timeline.DesiredFrameRate="240">
<DoubleAnimation Storyboard.TargetProperty="Opacity" From="0" To="1" RepeatBehavior="Forever" AutoReverse="True" Duration="0:0:0.200"/>
</Storyboard>
</BeginStoryboard>
diff --git a/.Source/GTweak/View/MoreView.xaml.cs b/.Source/GTweak/View/MoreView.xaml.cs
index aaf2f2ac..7db17fd5 100644
--- a/.Source/GTweak/View/MoreView.xaml.cs
+++ b/.Source/GTweak/View/MoreView.xaml.cs
@@ -54,7 +54,7 @@ namespace GTweak.View
{
Overlay.Visibility = Visibility.Visible;
- Overlay.BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.3));
+ Overlay.BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.3));
TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
@@ -79,7 +79,7 @@ namespace GTweak.View
try { _isWinOldRemoval = await tcs.Task; }
catch (TaskCanceledException) { _isWinOldRemoval = false; }
- Overlay.BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.25, () => { Overlay.Visibility = Visibility.Collapsed; }));
+ Overlay.BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.25, () => { Overlay.Visibility = Visibility.Collapsed; }));
}
BackgroundQueue backgroundQueue = new BackgroundQueue();
diff --git a/.Source/GTweak/View/PakagesView.xaml.cs b/.Source/GTweak/View/PakagesView.xaml.cs
index c789707a..c2e2169a 100644
--- a/.Source/GTweak/View/PakagesView.xaml.cs
+++ b/.Source/GTweak/View/PakagesView.xaml.cs
@@ -69,7 +69,7 @@ namespace GTweak.View
{
Overlay.Visibility = Visibility.Visible;
- Overlay.BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.3));
+ Overlay.BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.3));
TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
@@ -93,7 +93,7 @@ namespace GTweak.View
try { _isWebViewRemoval = await tcs.Task; }
catch (TaskCanceledException) { _isWebViewRemoval = false; }
- Overlay.BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.25, () => { Overlay.Visibility = Visibility.Collapsed; }));
+ Overlay.BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.25, () => { Overlay.Visibility = Visibility.Collapsed; }));
}
BackgroundQueue backgroundQueue = new BackgroundQueue();
diff --git a/.Source/GTweak/Windows/ImportWindow.xaml.cs b/.Source/GTweak/Windows/ImportWindow.xaml.cs
index e5feae33..d1a1254e 100644
--- a/.Source/GTweak/Windows/ImportWindow.xaml.cs
+++ b/.Source/GTweak/Windows/ImportWindow.xaml.cs
@@ -38,7 +38,7 @@ namespace GTweak.Windows
private async void Window_Loaded(object sender, RoutedEventArgs e)
{
- BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.2));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.2));
Progress<byte> progress = new Progress<byte>(ReportProgress);
try { await ApplyTweaksWithProgress(_cancellationTokenSource.Token, progress); } catch (Exception ex) { ErrorLogging.LogDebug(ex); }
}
@@ -56,7 +56,7 @@ namespace GTweak.Windows
new NotificationManager().Show("logout");
App.UpdateImport();
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.1, () => { Close(); }));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.1, () => { Close(); }));
}
}
diff --git a/.Source/GTweak/Windows/LoadingWindow.xaml.cs b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
index eb1bcc5a..755e4355 100644
--- a/.Source/GTweak/Windows/LoadingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/LoadingWindow.xaml.cs
@@ -74,9 +74,9 @@ namespace GTweak.Windows
{
Closing -= Window_Closing;
e.Cancel = true;
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.1, () => { Close(); }));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.1, () => { Close(); }));
}
- private void Window_Loaded(object sender, RoutedEventArgs e) => BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.1));
+ private void Window_Loaded(object sender, RoutedEventArgs e) => BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.1));
}
}
diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.cs
index 55013a29..65487cdd 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs
@@ -43,35 +43,15 @@ namespace GTweak
private void AnimationSettingsMenu()
{
- Storyboard storyboard = new Storyboard();
-
- DoubleAnimation rotateAnimation = new DoubleAnimation()
- {
- From = 0.0,
- To = 360,
- EasingFunction = new QuadraticEase(),
- SpeedRatio = 2.0,
- Duration = TimeSpan.FromSeconds(1)
- };
-
- DoubleAnimation widthAnimation = new DoubleAnimation()
- {
- From = SettingsMenu.Width != 400 ? 0 : 400,
- To = SettingsMenu.Width != 400 ? 400 : 0,
- EasingFunction = new QuadraticEase(),
- SpeedRatio = 2.0,
- Duration = TimeSpan.FromSeconds(1)
- };
-
- Timeline.SetDesiredFrameRate(rotateAnimation, 240);
- Timeline.SetDesiredFrameRate(widthAnimation, 240);
+ DoubleAnimation rotateAnimation = FactoryAnimation.CreateIn(0, 360, 0.5);
+ Storyboard storyboard = new Storyboard();
Storyboard.SetTarget(rotateAnimation, ImageSettings);
Storyboard.SetTargetProperty(rotateAnimation, new PropertyPath("(UIElement.RenderTransform).(RotateTransform.Angle)"));
storyboard.Children.Add(rotateAnimation);
storyboard.Begin();
- SettingsMenu.BeginAnimation(WidthProperty, widthAnimation);
+ SettingsMenu.BeginAnimation(WidthProperty, FactoryAnimation.CreateIn(SettingsMenu.Width != 400 ? 0 : 400, SettingsMenu.Width != 400 ? 400 : 0, 0.5));
}
private void SettingsMenu_QueryCursor(object sender, QueryCursorEventArgs e)
@@ -100,12 +80,12 @@ namespace GTweak
{
Closing -= Window_Closing;
e.Cancel = true;
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.1, () => { Close(); }));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.1, () => { Close(); }));
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
- BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.3,
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.3,
async () =>
{
if (SystemDiagnostics.IsNeedUpdate && SettingsEngine.IsUpdateCheckRequired)
diff --git a/.Source/GTweak/Windows/MessageWindow.xaml.cs b/.Source/GTweak/Windows/MessageWindow.xaml.cs
index 214cf822..7d1e5aa5 100644
--- a/.Source/GTweak/Windows/MessageWindow.xaml.cs
+++ b/.Source/GTweak/Windows/MessageWindow.xaml.cs
@@ -45,9 +45,9 @@ namespace GTweak.Windows
{
Closing -= Window_Closing;
e.Cancel = true;
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.1, () => { Close(); }));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.1, () => { Close(); }));
}
- private void Window_Loaded(object sender, RoutedEventArgs e) => BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.2));
+ private void Window_Loaded(object sender, RoutedEventArgs e) => BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.2));
}
}
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml b/.Source/GTweak/Windows/NotificationWindow.xaml
index 80cd870d..5f73e1a1 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml
@@ -58,7 +58,7 @@
</Trigger>
<EventTrigger RoutedEvent="Loaded">
<BeginStoryboard>
- <Storyboard Timeline.DesiredFrameRate="400">
+ <Storyboard Timeline.DesiredFrameRate="240">
<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)" From="0" To="0" Duration="0"/>
</Storyboard>
</BeginStoryboard>
diff --git a/.Source/GTweak/Windows/NotificationWindow.xaml.cs b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
index 0372c1b9..c1c85172 100644
--- a/.Source/GTweak/Windows/NotificationWindow.xaml.cs
+++ b/.Source/GTweak/Windows/NotificationWindow.xaml.cs
@@ -71,14 +71,14 @@ namespace GTweak.Windows
Timeline.SetDesiredFrameRate(doubleAnimKeyFrames, 240);
BeginAnimation(Canvas.LeftProperty, doubleAnimKeyFrames);
- BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.25));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.25));
}
private void Window_Closing(object sender, CancelEventArgs e)
{
Closing -= Window_Closing;
e.Cancel = true;
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.1, () => { Close(); }));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.1, () => { Close(); }));
}
}
}
diff --git a/.Source/GTweak/Windows/RebootWindow.xaml.cs b/.Source/GTweak/Windows/RebootWindow.xaml.cs
index 72dec012..3c216e61 100644
--- a/.Source/GTweak/Windows/RebootWindow.xaml.cs
+++ b/.Source/GTweak/Windows/RebootWindow.xaml.cs
@@ -12,6 +12,6 @@ namespace GTweak.Windows
InitializeComponent();
}
- private void Window_Loaded(object sender, RoutedEventArgs e) => RestartProgress.BeginAnimation(ProgressBar.ValueProperty, FadeAnimation.FadeIn(100, 1.5, () => { SettingsEngine.SelfReboot(); }));
+ private void Window_Loaded(object sender, RoutedEventArgs e) => RestartProgress.BeginAnimation(ProgressBar.ValueProperty, FactoryAnimation.CreateIn(0, 100, 1.5, () => { SettingsEngine.SelfReboot(); }));
}
}
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml b/.Source/GTweak/Windows/UpdateWindow.xaml
index 012993fc..094743dc 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml
@@ -52,7 +52,7 @@
</Trigger>
<EventTrigger RoutedEvent="Loaded">
<BeginStoryboard>
- <Storyboard Timeline.DesiredFrameRate="400">
+ <Storyboard Timeline.DesiredFrameRate="240">
<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)" From="0" To="0" Duration="0"/>
</Storyboard>
</BeginStoryboard>
diff --git a/.Source/GTweak/Windows/UpdateWindow.xaml.cs b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
index d2b50c98..a1c3dfcc 100644
--- a/.Source/GTweak/Windows/UpdateWindow.xaml.cs
+++ b/.Source/GTweak/Windows/UpdateWindow.xaml.cs
@@ -26,13 +26,13 @@ namespace GTweak.Windows
if (e.LeftButton == MouseButtonState.Pressed)
DragMove();
}
- private void Window_Loaded(object sender, RoutedEventArgs e) => BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(1, 0.3));
+ private void Window_Loaded(object sender, RoutedEventArgs e) => BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 1, 0.3));
private void Window_Closing(object sender, CancelEventArgs e)
{
Closing -= Window_Closing;
e.Cancel = true;
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.1, () => { Close(); }));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.1, () => { Close(); }));
}
private void BtnExit_PreviewMouseDown(object sender, MouseButtonEventArgs e)
diff --git a/.Source/GTweak/Windows/WaitingWindow.xaml.cs b/.Source/GTweak/Windows/WaitingWindow.xaml.cs
index a1a9a84e..6248d39c 100644
--- a/.Source/GTweak/Windows/WaitingWindow.xaml.cs
+++ b/.Source/GTweak/Windows/WaitingWindow.xaml.cs
@@ -22,7 +22,7 @@ namespace GTweak.Windows
{
Closing -= Window_Closing;
e.Cancel = true;
- BeginAnimation(OpacityProperty, FadeAnimation.FadeTo(0.15, () =>
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateTo(0.15, () =>
{
ProcessModule objCurrentModule = Process.GetCurrentProcess().MainModule;
disablingWinKeys.objKeyboardProcess = new DisablingWinKeys.LowLevelKeyboardProc(disablingWinKeys.CaptureKey);
@@ -36,7 +36,7 @@ namespace GTweak.Windows
ProcessModule objCurrentModule = Process.GetCurrentProcess().MainModule;
disablingWinKeys.objKeyboardProcess = new DisablingWinKeys.LowLevelKeyboardProc(disablingWinKeys.CaptureKey);
disablingWinKeys.ptrHook = DisablingWinKeys.SetWindowsHookEx(13, disablingWinKeys.objKeyboardProcess, DisablingWinKeys.GetModuleHandle(objCurrentModule.ModuleName), 0);
- BeginAnimation(OpacityProperty, FadeAnimation.FadeIn(0.5, 0.3));
+ BeginAnimation(OpacityProperty, FactoryAnimation.CreateIn(0, 0.5, 0.3));
}
}
}