Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
upd. nuget & re
Greedeks249062140060
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csprojindex 524237f5..ba20fa70 100644--- a/.Source/GTweak/GTweak.csproj+++ b/.Source/GTweak/GTweak.csproj@@ -79,12 +79,25 @@<HintPath>..\..\packages\Ookii.Dialogs.Wpf.5.0.1\lib\net462\Ookii.Dialogs.Wpf.dll</HintPath></Reference><Reference Include="System" />+ <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">+ <HintPath>..\..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>+ </Reference><Reference Include="System.Data" /><Reference Include="System.Design" /><Reference Include="System.Drawing" /><Reference Include="System.IO.Compression" /><Reference Include="System.Management" />+ <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">+ <HintPath>..\..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>+ </Reference><Reference Include="System.Net" />+ <Reference Include="System.Numerics" />+ <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">+ <HintPath>..\..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>+ </Reference>+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">+ <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>+ </Reference><Reference Include="System.Security" /><Reference Include="System.ServiceProcess" /><Reference Include="System.Windows.Forms" />@@ -100,11 +113,11 @@<Reference Include="WindowsBase" /><Reference Include="PresentationCore" /><Reference Include="PresentationFramework" />- <Reference Include="Wpf.Ui, Version=4.0.0.0, Culture=neutral, PublicKeyToken=11f9f5cc97b3ffd6, processorArchitecture=MSIL">- <HintPath>..\..\packages\WPF-UI.4.0.3\lib\net472\Wpf.Ui.dll</HintPath>+ <Reference Include="Wpf.Ui, Version=4.1.0.0, Culture=neutral, PublicKeyToken=11f9f5cc97b3ffd6, processorArchitecture=MSIL">+ <HintPath>..\..\packages\WPF-UI.4.1.0\lib\net472\Wpf.Ui.dll</HintPath></Reference>- <Reference Include="Wpf.Ui.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=11f9f5cc97b3ffd6, processorArchitecture=MSIL">- <HintPath>..\..\packages\WPF-UI.Abstractions.4.0.3\lib\net472\Wpf.Ui.Abstractions.dll</HintPath>+ <Reference Include="Wpf.Ui.Abstractions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=11f9f5cc97b3ffd6, processorArchitecture=MSIL">+ <HintPath>..\..\packages\WPF-UI.Abstractions.4.1.0\lib\net462\Wpf.Ui.Abstractions.dll</HintPath></Reference><Reference Include="XamlRadialProgressBar.DotNet, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL"><HintPath>..\..\packages\XamlRadialProgressBar.1.0.3\lib\net452\XamlRadialProgressBar.DotNet.dll</HintPath>diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.csindex 6d232ea4..ac995465 100644--- a/.Source/GTweak/Windows/MainWindow.xaml.cs+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs@@ -19,6 +19,7 @@ namespace GTweak.Windowsprivate Point? _lastNormalPosition;private Size? _lastNormalSize;private Point _mouseDownWindowPoint;+public MainWindow(){InitializeComponent();@@ -53,65 +54,58 @@ namespace GTweak.Windowsprivate void TitleBar_MouseDown(object sender, MouseButtonEventArgs e){- if (e.ChangedButton != MouseButton.Left || e.ClickCount == 2)+ if (e.ChangedButton == MouseButton.Left && e.ClickCount != 2){- return;- }-- if (WindowState == WindowState.Maximized)- {- _mouseDownWindowPoint = e.GetPosition(this);- _draggingFromMaximized = true;- }- else- {- DragMove();+ if (WindowState == WindowState.Maximized)+ {+ _mouseDownWindowPoint = e.GetPosition(this);+ _draggingFromMaximized = true;+ }+ else+ {+ DragMove();+ }}}private void TitleBar_MouseMove(object sender, MouseEventArgs e){- if (!_draggingFromMaximized)- {- return;- }-- if (e.LeftButton != MouseButtonState.Pressed)+ if (_draggingFromMaximized){- _draggingFromMaximized = false;- return;- }+ if (e.LeftButton != MouseButtonState.Pressed)+ {+ _draggingFromMaximized = false;+ return;+ }- Point initialScreen = PointToScreen(_mouseDownWindowPoint);- Point currentScreen = PointToScreen(e.GetPosition(this));- Vector delta = currentScreen - initialScreen;+ Point currentScreen = PointToScreen(e.GetPosition(this));+ Vector delta = currentScreen - PointToScreen(_mouseDownWindowPoint);- if (Math.Abs(delta.X) > SystemParameters.MinimumHorizontalDragDistance || Math.Abs(delta.Y) > SystemParameters.MinimumVerticalDragDistance)- {- _draggingFromMaximized = false;+ if (Math.Abs(delta.X) > SystemParameters.MinimumHorizontalDragDistance || Math.Abs(delta.Y) > SystemParameters.MinimumVerticalDragDistance)+ {+ _draggingFromMaximized = false;- Size restoreSize = _lastNormalSize ?? new Size(RestoreBounds.Width, RestoreBounds.Height);- double restoreWidth = restoreSize.Width;- double restoreHeight = restoreSize.Height;+ Size restoreSize = _lastNormalSize ?? new Size(RestoreBounds.Width, RestoreBounds.Height);+ double restoreWidth = restoreSize.Width;+ double restoreHeight = restoreSize.Height;- double relX = ActualWidth > 0 ? _mouseDownWindowPoint.X / ActualWidth : 0.5;+ double relX = ActualWidth > 0 ? _mouseDownWindowPoint.X / ActualWidth : 0.5;- WindowState = WindowState.Normal;- Width = restoreWidth;- Height = restoreHeight;+ WindowState = WindowState.Normal;+ Width = restoreWidth;+ Height = restoreHeight;- double left = currentScreen.X - restoreWidth * relX;- double top = currentScreen.Y - _mouseDownWindowPoint.Y;+ double left = currentScreen.X - restoreWidth * relX;+ double top = currentScreen.Y - _mouseDownWindowPoint.Y;- double screenW = SystemParameters.PrimaryScreenWidth;- double screenH = SystemParameters.PrimaryScreenHeight;- left = Math.Max(0, Math.Min(Math.Max(0, screenW - restoreWidth), left));- top = Math.Max(0, Math.Min(Math.Max(0, screenH - restoreHeight), top));+ left = Math.Max(0, Math.Min(Math.Max(0, SystemParameters.PrimaryScreenWidth - restoreWidth), left));+ top = Math.Max(0, Math.Min(Math.Max(0, SystemParameters.PrimaryScreenHeight - restoreHeight), top));- Left = left;- Top = top;+ Left = left;+ Top = top;- Dispatcher.BeginInvoke((Action)(() => { DragMove(); }));+ Dispatcher.BeginInvoke((Action)(() => { DragMove(); }));+ }}}@@ -119,47 +113,42 @@ namespace GTweak.Windowsprivate void TitleBar_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e){- if (e.ChangedButton != MouseButton.Left || e.ClickCount != 2)+ if (e.ChangedButton == MouseButton.Left && e.ClickCount == 2){- return;- }-- if (e.OriginalSource is DependencyObject source)- {- DependencyObject current = source;- while (current != null)+ if (e.OriginalSource is DependencyObject source){- if (current is ButtonBase)+ DependencyObject current = source;+ while (current != null){- return;- }+ if (current is ButtonBase)+ {+ return;+ }- current = VisualTreeHelper.GetParent(current);+ current = VisualTreeHelper.GetParent(current);+ }}- }- _ignoreMouseClick = true;+ _ignoreMouseClick = true;- bool wasMax = WindowState == WindowState.Maximized;+ HandleWindowState();- HandleWindowState();-- if (wasMax && _lastNormalPosition.HasValue && _lastNormalSize.HasValue)- {- Point pos = _lastNormalPosition.Value;- Size sz = _lastNormalSize.Value;-- Dispatcher.BeginInvoke((Action)(() =>+ if (WindowState == WindowState.Maximized && _lastNormalPosition.HasValue && _lastNormalSize.HasValue){- Left = pos.X;- Top = pos.Y;- Width = sz.Width;- Height = sz.Height;- }));- }+ Point pos = _lastNormalPosition.Value;+ Size sz = _lastNormalSize.Value;+ Dispatcher.BeginInvoke((Action)(() =>+ {+ Left = pos.X;+ Top = pos.Y;+ Width = sz.Width;+ Height = sz.Height;+ }));+ }- e.Handled = true;+ e.Handled = true;+ }}private void TitleButton_Click(object sender, RoutedEventArgs e)diff --git a/.Source/GTweak/packages.config b/.Source/GTweak/packages.configindex 3a7cc4bd..a39f662a 100644--- a/.Source/GTweak/packages.config+++ b/.Source/GTweak/packages.config@@ -4,8 +4,12 @@<package id="Fody" version="6.9.3" targetFramework="net48" developmentDependency="true" /><package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" /><package id="Ookii.Dialogs.Wpf" version="5.0.1" targetFramework="net48" />+ <package id="System.Buffers" version="4.6.1" targetFramework="net48" />+ <package id="System.Memory" version="4.6.3" targetFramework="net48" />+ <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />+ <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" /><package id="TaskScheduler" version="2.12.2" targetFramework="net48" />- <package id="WPF-UI" version="4.0.3" targetFramework="net48" />- <package id="WPF-UI.Abstractions" version="4.0.3" targetFramework="net48" />+ <package id="WPF-UI" version="4.1.0" targetFramework="net48" />+ <package id="WPF-UI.Abstractions" version="4.1.0" targetFramework="net48" /><package id="XamlRadialProgressBar" version="1.0.3" targetFramework="net48" /></packages>\ No newline at end of file