Skip to content

Portable Tool for an Ideal Windows Setup

add taskbar position picker & refactor async logic

Greedeks33d275753e30
diff --git a/.Source/GTweak/Assets/UserControls/Card.xaml.cs b/.Source/GTweak/Assets/UserControls/Card.xaml.cs
index 3b2dce57..a174b195 100644
--- a/.Source/GTweak/Assets/UserControls/Card.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/Card.xaml.cs
@@ -5,7 +5,7 @@ using System.Windows.Input;
namespace GTweak.Assets.UserControls
{
- public partial class Card
+ public sealed partial class Card
{
internal event EventHandler ClickButton, ClickButtonSecondary;
diff --git a/.Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs
index 2c16ae10..c16dbd70 100644
--- a/.Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/ColorPicker.xaml.cs
@@ -12,7 +12,7 @@ using GTweak.Animations;
namespace GTweak.Assets.UserControls
{
- public partial class ColorPicker
+ public sealed partial class ColorPicker
{
internal event EventHandler ColorPicked;
diff --git a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs
index 80227dd2..b8fa72a2 100644
--- a/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/DescriptionBlock.xaml.cs
@@ -12,7 +12,7 @@ using GTweak.Modules.Common;
namespace GTweak.Assets.UserControls
{
- public partial class DescriptionBlock
+ public sealed partial class DescriptionBlock
{
private CancellationTokenSource _scrollCts;
private string _currentDefaultText = string.Empty;
@@ -71,29 +71,31 @@ namespace GTweak.Assets.UserControls
string safeValue = value ?? string.Empty;
_currentDefaultText = safeValue;
- _scrollCts?.Cancel();
+ CancellationTokenSource cts = new CancellationTokenSource();
+ Interlocked.Exchange(ref _scrollCts, cts)?.Cancel();
- if (Scroller != null && FunctionDescription != null)
+ if (Scroller == null || FunctionDescription == null)
{
- UpdateFlowDirection();
+ return;
+ }
- Scroller.BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, null);
- Scroller.ScrollToVerticalOffset(0);
- Scroller.UpdateLayout();
+ UpdateFlowDirection();
- StatusPanel.BeginAnimation(OpacityProperty, null);
- StatusPanel.Opacity = 0;
+ Scroller.BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, null);
+ Scroller.ScrollToVerticalOffset(0);
+ Scroller.UpdateLayout();
- TimeSpan duration = safeValue.Length <= 50 ? TimeSpan.FromMilliseconds(200) : safeValue.Length <= 200 ? TimeSpan.FromMilliseconds(400) : TimeSpan.FromMilliseconds(550);
+ StatusPanel.BeginAnimation(OpacityProperty, null);
+ StatusPanel.Opacity = 0;
- Caret.BeginAnimation(OpacityProperty, AnimationFactory.CreateIn(1.0, 0.0, 0.3, reverse: true));
+ TimeSpan duration = safeValue.Length <= 50 ? TimeSpan.FromMilliseconds(200) : safeValue.Length <= 200 ? TimeSpan.FromMilliseconds(400) : TimeSpan.FromMilliseconds(550);
- FunctionDescription.Text = string.Empty;
- TypewriterAnimation.Create(safeValue, FunctionDescription, duration);
+ Caret.BeginAnimation(OpacityProperty, AnimationFactory.CreateIn(1.0, 0.0, 0.3, reverse: true));
- _scrollCts = new CancellationTokenSource();
- _ = HandleStatusAndScrollAsync(safeValue, duration, _scrollCts.Token);
- }
+ FunctionDescription.Text = string.Empty;
+ TypewriterAnimation.Create(safeValue, FunctionDescription, duration);
+
+ _ = HandleStatusAndScrollAsync(safeValue, duration, cts.Token);
}
}
@@ -103,6 +105,7 @@ namespace GTweak.Assets.UserControls
Loaded += delegate
{
+ App.LanguageChanged -= OnLanguageChanged;
App.LanguageChanged += OnLanguageChanged;
if (FunctionDescription != null)
@@ -116,93 +119,92 @@ namespace GTweak.Assets.UserControls
Unloaded += delegate
{
App.LanguageChanged -= OnLanguageChanged;
- _scrollCts?.Cancel();
+ Interlocked.Exchange(ref _scrollCts, null)?.Cancel();
};
}
private void OnLanguageChanged(object sender, EventArgs e)
{
- _scrollCts?.Cancel();
- if (FunctionDescription != null)
+ Interlocked.Exchange(ref _scrollCts, null)?.Cancel();
+
+ if (FunctionDescription == null)
{
- UpdateFlowDirection();
- _currentDefaultText = DefaultText;
- FunctionDescription.Text = string.Empty;
- TypewriterAnimation.Create(DefaultText, FunctionDescription, TimeSpan.Zero);
+ return;
}
+
+ UpdateFlowDirection();
+ _currentDefaultText = DefaultText;
+ FunctionDescription.Text = string.Empty;
+ TypewriterAnimation.Create(DefaultText, FunctionDescription, TimeSpan.Zero);
}
private void UpdateFlowDirection()
{
if (FunctionDescription != null && !DesignerProperties.GetIsInDesignMode(new DependencyObject()))
{
- try
- {
- FunctionDescription.FlowDirection = CultureInfo.GetCultureInfo(GlobalOptions.Language).TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
- }
+ try { FunctionDescription.FlowDirection = CultureInfo.GetCultureInfo(GlobalOptions.Language).TextInfo.IsRightToLeft ? FlowDirection.RightToLeft : FlowDirection.LeftToRight; }
catch (CultureNotFoundException) { FunctionDescription.FlowDirection = FlowDirection.LeftToRight; }
}
}
private async Task HandleStatusAndScrollAsync(string text, TimeSpan typewriterDuration, CancellationToken token)
{
- await Task.Delay(typewriterDuration, token);
-
- if (!token.IsCancellationRequested)
+ try
{
+ await Task.Delay(typewriterDuration, token);
+
await Dispatcher.InvokeAsync(() =>
{
- if (!token.IsCancellationRequested)
+ if (token.IsCancellationRequested)
{
- Caret.BeginAnimation(OpacityProperty, null);
- Caret.Opacity = 1;
+ return;
+ }
- if (TargetState != null && text != DefaultText)
- {
- StatusPanel.BeginAnimation(OpacityProperty, AnimationFactory.CreateIn(0.0, 1.0, 0.3));
- }
+ Caret.BeginAnimation(OpacityProperty, null);
+ Caret.Opacity = 1;
+
+ if (TargetState != null && text != DefaultText)
+ {
+ StatusPanel.BeginAnimation(OpacityProperty, AnimationFactory.CreateIn(0.0, 1.0, 0.3));
}
});
await Task.Delay(1500, token);
- if (text != DefaultText && !token.IsCancellationRequested)
+ if (text == DefaultText)
{
- await Dispatcher.InvokeAsync(() =>
- {
- if (FunctionDescription != null && Scroller != null)
- {
- FunctionDescription.UpdateLayout();
- Scroller.UpdateLayout();
- }
- });
-
- if (Scroller != null && !token.IsCancellationRequested)
+ return;
+ }
+
+ await Dispatcher.InvokeAsync(() =>
+ {
+ FunctionDescription?.UpdateLayout();
+ Scroller?.UpdateLayout();
+ });
+
+ double maxOffset = 0;
+ await Dispatcher.InvokeAsync(() => maxOffset = Scroller?.ScrollableHeight ?? 0);
+
+ if (maxOffset <= 0)
+ {
+ return;
+ }
+
+ double durationSeconds = Math.Min(6.0, maxOffset / 20.0 + 0.8);
+
+ await Dispatcher.InvokeAsync(() =>
+ {
+ if (token.IsCancellationRequested)
{
- double maxOffset = Scroller.ScrollableHeight;
- if (maxOffset > 0)
- {
- double durationSeconds = Math.Min(6.0, (maxOffset / 20.0) + 0.8);
-
- await Dispatcher.InvokeAsync(() =>
- {
- DoubleAnimation inertiaAnimation = new DoubleAnimation(0, maxOffset, TimeSpan.FromSeconds(durationSeconds))
- {
- EasingFunction = new QuarticEase { EasingMode = EasingMode.EaseOut }
- };
-
- Scroller?.BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, inertiaAnimation);
- });
-
- try
- {
- await Task.Delay(TimeSpan.FromSeconds(durationSeconds), token);
- }
- catch (Exception ex) { ErrorLogger.LogDebug(ex); }
- }
+ return;
}
- }
+
+ Scroller.BeginAnimation(ScrollViewerBehavior.VerticalOffsetProperty, new DoubleAnimation(0, maxOffset, TimeSpan.FromSeconds(durationSeconds)) { EasingFunction = new QuarticEase { EasingMode = EasingMode.EaseOut } });
+ });
+
+ await Task.Delay(TimeSpan.FromSeconds(durationSeconds), token);
}
+ catch (Exception ex) { ErrorLogger.LogDebug(ex); }
}
}
}
\ No newline at end of file
diff --git a/.Source/GTweak/Assets/UserControls/ExpandableBox.xaml.cs b/.Source/GTweak/Assets/UserControls/ExpandableBox.xaml.cs
index 536616c2..36aaef2c 100644
--- a/.Source/GTweak/Assets/UserControls/ExpandableBox.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/ExpandableBox.xaml.cs
@@ -13,7 +13,7 @@ using GTweak.Animations;
namespace GTweak.Assets.UserControls
{
[ContentProperty("Items")]
- public partial class ExpandableBox : UserControl
+ public sealed partial class ExpandableBox : UserControl
{
internal event EventHandler Closed;
diff --git a/.Source/GTweak/Assets/UserControls/ExportItem.xaml.cs b/.Source/GTweak/Assets/UserControls/ExportItem.xaml.cs
index 3bd2390b..bb18bc5c 100644
--- a/.Source/GTweak/Assets/UserControls/ExportItem.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/ExportItem.xaml.cs
@@ -4,7 +4,7 @@ using System.Windows.Input;
namespace GTweak.Assets.UserControls
{
- public partial class ExportItem : UserControl
+ public sealed partial class ExportItem : UserControl
{
public static readonly DependencyProperty LabelProperty =
DependencyProperty.Register(nameof(Label), typeof(string), typeof(ExportItem), new PropertyMetadata(null));
diff --git a/.Source/GTweak/Assets/UserControls/FileCard.xaml.cs b/.Source/GTweak/Assets/UserControls/FileCard.xaml.cs
index be88a238..143977e2 100644
--- a/.Source/GTweak/Assets/UserControls/FileCard.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/FileCard.xaml.cs
@@ -6,7 +6,7 @@ using GTweak.Animations;
namespace GTweak.Assets.UserControls
{
- public partial class FileCard
+ public sealed partial class FileCard
{
public static readonly DependencyProperty FileNameProperty =
DependencyProperty.Register(nameof(FileName), typeof(string), typeof(FileCard), new PropertyMetadata(string.Empty));
diff --git a/.Source/GTweak/Assets/UserControls/FlowPanel.cs b/.Source/GTweak/Assets/UserControls/FlowPanel.cs
index 61f0ae1f..ea3d8937 100644
--- a/.Source/GTweak/Assets/UserControls/FlowPanel.cs
+++ b/.Source/GTweak/Assets/UserControls/FlowPanel.cs
@@ -6,7 +6,7 @@ using GTweak.Modules.Common;
namespace GTweak.Assets.UserControls
{
- internal sealed class FlowPanel : Panel
+ public sealed class FlowPanel : Panel
{
private sealed class FlowItemGroup
{
diff --git a/.Source/GTweak/Assets/UserControls/InfoCard.xaml.cs b/.Source/GTweak/Assets/UserControls/InfoCard.xaml.cs
index ee715759..ab9c9d2d 100644
--- a/.Source/GTweak/Assets/UserControls/InfoCard.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/InfoCard.xaml.cs
@@ -3,7 +3,7 @@ using System.Windows.Controls;
namespace GTweak.Assets.UserControls
{
- public partial class InfoCard : UserControl
+ public sealed partial class InfoCard : UserControl
{
internal static readonly DependencyProperty IconStyleProperty =
DependencyProperty.Register(nameof(IconStyle), typeof(Style), typeof(InfoCard), new PropertyMetadata(null, OnIconStyleChanged));
diff --git a/.Source/GTweak/Assets/UserControls/TaskbarPositionPicker.xaml b/.Source/GTweak/Assets/UserControls/TaskbarPositionPicker.xaml
new file mode 100644
index 00000000..1ace6f7e
--- /dev/null
+++ b/.Source/GTweak/Assets/UserControls/TaskbarPositionPicker.xaml
@@ -0,0 +1,125 @@
+<UserControl x:Class="GTweak.Assets.UserControls.TaskbarPositionPicker"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ mc:Ignorable="d" x:Name="Root" Width="48" Height="40"
+ SnapsToDevicePixels="True" UseLayoutRounding="True" BorderBrush="{StaticResource Brush_Separator}">
+ <Viewbox Stretch="Uniform">
+ <Grid Margin="3">
+ <Rectangle RadiusX="7" RadiusY="7" Fill="{StaticResource Brush_ShadowOverlay}" Opacity="0.7">
+ <Rectangle.RenderTransform>
+ <TranslateTransform X="1.5" Y="1.5"/>
+ </Rectangle.RenderTransform>
+ </Rectangle>
+
+ <Grid Width="46" Height="36">
+ <Rectangle RadiusX="7" RadiusY="7" Stroke="{Binding BorderBrush, ElementName=Root}" StrokeThickness="1" Fill="{StaticResource Brush_Background_ComboBox}" IsHitTestVisible="False"/>
+ <Path Data="M 0,0 L 23,18 L 0,36 Z" Tag="0" Fill="Transparent" Cursor="Hand" MouseLeftButtonDown="Sector_MouseLeftButtonDown"/>
+ <Path Data="M 0,0 L 46,0 L 23,18 Z" Tag="1" Fill="Transparent" Cursor="Hand" MouseLeftButtonDown="Sector_MouseLeftButtonDown"/>
+ <Path Data="M 46,0 L 23,18 L 46,36 Z" Tag="2" Fill="Transparent" Cursor="Hand" MouseLeftButtonDown="Sector_MouseLeftButtonDown"/>
+ <Path Data="M 0,36 L 46,36 L 23,18 Z" Tag="3" Fill="Transparent" Cursor="Hand" MouseLeftButtonDown="Sector_MouseLeftButtonDown"/>
+
+ <Grid IsHitTestVisible="False">
+ <Rectangle Fill="{StaticResource Brush_Separator}" RadiusX="1.25" RadiusY="1.25" Width="2.5" Height="9" HorizontalAlignment="Left" Margin="3.5,0,0,0"/>
+ <Rectangle Fill="{StaticResource Brush_Separator}" RadiusX="1.25" RadiusY="1.25" Width="12" Height="2.5" VerticalAlignment="Top" Margin="0,3.5,0,0"/>
+ <Rectangle Fill="{StaticResource Brush_Separator}" RadiusX="1.25" RadiusY="1.25" Width="2.5" Height="9" HorizontalAlignment="Right" Margin="0,0,3.5,0"/>
+ <Rectangle Fill="{StaticResource Brush_Separator}" RadiusX="1.25" RadiusY="1.25" Width="12" Height="2.5" VerticalAlignment="Bottom" Margin="0,0,0,3.5"/>
+ <Rectangle x:Name="PositionIndicator" Fill="{StaticResource Brush_Accent}" RadiusX="1.25" RadiusY="1.25" RenderTransformOrigin="0.5, 0.5">
+ <Rectangle.RenderTransform>
+ <ScaleTransform/>
+ </Rectangle.RenderTransform>
+ <Rectangle.Style>
+ <Style TargetType="Rectangle">
+ <Setter Property="VerticalAlignment" Value="Bottom"/>
+ <Setter Property="HorizontalAlignment" Value="Center"/>
+ <Setter Property="Width" Value="12"/>
+ <Setter Property="Height" Value="2.5"/>
+ <Setter Property="Margin" Value="0,0,0,3.5"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="0">
+ <Setter Property="VerticalAlignment" Value="Center"/>
+ <Setter Property="HorizontalAlignment" Value="Left"/>
+ <Setter Property="Width" Value="2.5"/>
+ <Setter Property="Height" Value="9"/>
+ <Setter Property="Margin" Value="3.5,0,0,0"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="1">
+ <Setter Property="VerticalAlignment" Value="Top"/>
+ <Setter Property="HorizontalAlignment" Value="Center"/>
+ <Setter Property="Width" Value="12"/>
+ <Setter Property="Height" Value="2.5"/>
+ <Setter Property="Margin" Value="0,3.5,0,0"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="2">
+ <Setter Property="VerticalAlignment" Value="Center"/>
+ <Setter Property="HorizontalAlignment" Value="Right"/>
+ <Setter Property="Width" Value="2.5"/>
+ <Setter Property="Height" Value="9"/>
+ <Setter Property="Margin" Value="0,0,3.5,0"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="3">
+ <Setter Property="VerticalAlignment" Value="Bottom"/>
+ <Setter Property="HorizontalAlignment" Value="Center"/>
+ <Setter Property="Width" Value="12"/>
+ <Setter Property="Height" Value="2.5"/>
+ <Setter Property="Margin" Value="0,0,0,3.5"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Rectangle.Style>
+ </Rectangle>
+
+ <Grid Width="28" Height="18">
+ <Rectangle RadiusX="3" RadiusY="3" Stroke="{StaticResource Brush_Separator}" StrokeThickness="1.5"/>
+ <Rectangle x:Name="TaskbarIndicator" Fill="{StaticResource Brush_Accent}" RenderTransformOrigin="0.5, 0.5" RadiusX="1.5" RadiusY="1.5">
+ <Rectangle.RenderTransform>
+ <ScaleTransform/>
+ </Rectangle.RenderTransform>
+ <Rectangle.Style>
+ <Style TargetType="Rectangle">
+ <Setter Property="VerticalAlignment" Value="Bottom"/>
+ <Setter Property="HorizontalAlignment" Value="Stretch"/>
+ <Setter Property="Height" Value="3"/>
+ <Setter Property="Width" Value="Auto"/>
+ <Setter Property="Margin" Value="2,0,2,2"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="0">
+ <Setter Property="VerticalAlignment" Value="Stretch"/>
+ <Setter Property="HorizontalAlignment" Value="Left"/>
+ <Setter Property="Height" Value="Auto"/>
+ <Setter Property="Width" Value="3"/>
+ <Setter Property="Margin" Value="2,2,0,2"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="1">
+ <Setter Property="VerticalAlignment" Value="Top"/>
+ <Setter Property="HorizontalAlignment" Value="Stretch"/>
+ <Setter Property="Height" Value="3"/>
+ <Setter Property="Width" Value="Auto"/>
+ <Setter Property="Margin" Value="2,2,2,0"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="2">
+ <Setter Property="VerticalAlignment" Value="Stretch"/>
+ <Setter Property="HorizontalAlignment" Value="Right"/>
+ <Setter Property="Height" Value="Auto"/>
+ <Setter Property="Width" Value="3"/>
+ <Setter Property="Margin" Value="0,2,2,2"/>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Position, ElementName=Root}" Value="3">
+ <Setter Property="VerticalAlignment" Value="Bottom"/>
+ <Setter Property="HorizontalAlignment" Value="Stretch"/>
+ <Setter Property="Height" Value="3"/>
+ <Setter Property="Width" Value="Auto"/>
+ <Setter Property="Margin" Value="2,0,2,2"/>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Rectangle.Style>
+ </Rectangle>
+ </Grid>
+
+ </Grid>
+ </Grid>
+ </Grid>
+ </Viewbox>
+</UserControl>
\ No newline at end of file
diff --git a/.Source/GTweak/Assets/UserControls/TaskbarPositionPicker.xaml.cs b/.Source/GTweak/Assets/UserControls/TaskbarPositionPicker.xaml.cs
new file mode 100644
index 00000000..6810ed33
--- /dev/null
+++ b/.Source/GTweak/Assets/UserControls/TaskbarPositionPicker.xaml.cs
@@ -0,0 +1,53 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using GTweak.Animations;
+
+namespace GTweak.Assets.UserControls
+{
+ public partial class TaskbarPositionPicker : UserControl
+ {
+ private static readonly DoubleAnimation _doubleAnim = AnimationFactory.CreateIn(0.4, 1.0, 0.2, useCubicEase: true);
+
+ internal static readonly DependencyProperty PositionProperty =
+ DependencyProperty.Register(nameof(Position), typeof(int), typeof(TaskbarPositionPicker), new FrameworkPropertyMetadata(3, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnPositionChanged));
+
+ internal int Position
+ {
+ get => (int)GetValue(PositionProperty);
+ set => SetValue(PositionProperty, value);
+ }
+
+ public TaskbarPositionPicker()
+ {
+ InitializeComponent();
+ }
+
+ private static void OnPositionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ if (d is TaskbarPositionPicker picker && picker.IsLoaded)
+ {
+ picker.TaskbarIndicator?.RenderTransform.BeginAnimation(ScaleTransform.ScaleXProperty, _doubleAnim);
+ picker.TaskbarIndicator?.RenderTransform.BeginAnimation(ScaleTransform.ScaleYProperty, _doubleAnim);
+ picker.PositionIndicator?.RenderTransform.BeginAnimation(ScaleTransform.ScaleXProperty, _doubleAnim);
+ picker.PositionIndicator?.RenderTransform.BeginAnimation(ScaleTransform.ScaleYProperty, _doubleAnim);
+ }
+ }
+
+ private void Sector_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ if (sender is FrameworkElement elem && elem.Tag is string tag)
+ {
+ switch (tag)
+ {
+ case "0": Position = 0; break;
+ case "1": Position = 1; break;
+ case "2": Position = 2; break;
+ case "3": Position = 3; break;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/.Source/GTweak/Assets/UserControls/ToggleButton.xaml.cs b/.Source/GTweak/Assets/UserControls/ToggleButton.xaml.cs
index 9e6444d5..03bb377d 100644
--- a/.Source/GTweak/Assets/UserControls/ToggleButton.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/ToggleButton.xaml.cs
@@ -9,7 +9,7 @@ using GTweak.Animations;
namespace GTweak.Assets.UserControls
{
- public partial class ToggleButton
+ public sealed partial class ToggleButton
{
/// <summary>
/// Custom Event - Processing keypresses only for the button and not for the text
diff --git a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml.cs b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml.cs
index 8254a66f..a7416380 100644
--- a/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml.cs
+++ b/.Source/GTweak/Assets/UserControls/ToolsetCard.xaml.cs
@@ -6,7 +6,7 @@ using System.Windows.Media;
namespace GTweak.Assets.UserControls
{
- public partial class ToolsetCard : UserControl
+ public sealed partial class ToolsetCard : UserControl
{
public static readonly DependencyProperty AppIconProperty =
DependencyProperty.Register(nameof(AppIcon), typeof(ImageSource), typeof(ToolsetCard), new PropertyMetadata(null));
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index 83f624b5..65a7d891 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -159,6 +159,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Assets\UserControls\TaskbarPositionPicker.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Languages\**\*.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -172,6 +176,9 @@
<Compile Include="Assets\UserControls\Card.xaml.cs">
<DependentUpon>Card.xaml</DependentUpon>
</Compile>
+ <Compile Include="Assets\UserControls\TaskbarPositionPicker.xaml.cs">
+ <DependentUpon>TaskbarPositionPicker.xaml</DependentUpon>
+ </Compile>
<Compile Include="Core\Items\ExportCheckItem.cs" />
<Compile Include="Core\DataContracts\ExportChecklistValue.cs" />
<Compile Include="Core\DataContracts\ExportColorValue.cs" />