Portable Tool for an Ideal Windows Setup
C# activatorbloatware-removalcsharpdebloatdebloaterdisable-servicesmonitoring-systemportableprivacy-toolsregistry-tweakssystem-tuningsystem-utilitytelemetrytweakerwindows-10windows-11windows-debloatwindows-defenderwindows-optimizationwindows-tweaks
add standard window behavior (dragging and double-click)
Greedeks621fe22ccb63
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xamlindex 39fcd2d8..0e6e7f29 100644--- a/.Source/GTweak/Windows/MainWindow.xaml+++ b/.Source/GTweak/Windows/MainWindow.xaml@@ -20,7 +20,7 @@<RowDefinition Height="*"/></Grid.RowDefinitions>- <Grid x:Name="TitleBar" Grid.Row="0" MouseDown="TitleBar_MouseDown" Background="Transparent" PreviewMouseDown="TitleBar_PreviewMouseDown">+ <Grid x:Name="TitleBar" Grid.Row="0" Background="Transparent" MouseDown="TitleBar_MouseDown" MouseMove="TitleBar_MouseMove" MouseLeftButtonUp="TitleBar_MouseLeftButtonUp" PreviewMouseLeftButtonDown="TitleBar_PreviewMouseLeftButtonDown"><StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Right"><ToggleButton x:Name="ButtonTheme" IsChecked="{Binding StateButtonTheme}" Style="{StaticResource TglThemeSwitch}" Margin="0,0,0,2" HorizontalAlignment="Right" VerticalAlignment="Center" Click="TitleButton_Click"/>diff --git a/.Source/GTweak/Windows/MainWindow.xaml.cs b/.Source/GTweak/Windows/MainWindow.xaml.csindex 3a288b2b..ce106a53 100644--- a/.Source/GTweak/Windows/MainWindow.xaml.cs+++ b/.Source/GTweak/Windows/MainWindow.xaml.cs@@ -14,7 +14,10 @@ namespace GTweak.Windows{public partial class MainWindow : FluentWindow{- private bool _settingsOpen = false;+ private bool _settingsOpen = false, _prepareDragFromMax = false;+ private Point? _lastNormalPosition;+ private Size? _lastNormalSize;+ private Point _mouseDownWindowPoint;public MainWindow(){@@ -31,37 +34,129 @@ namespace GTweak.Windows}#region TitleBar- private void HandleWindowState() => WindowState = WindowState == WindowState.Normal ? WindowState.Maximized : WindowState.Normal;+ private void HandleWindowState()+ {+ if (WindowState == WindowState.Normal)+ {+ _lastNormalPosition = new Point(Left, Top);+ _lastNormalSize = new Size(Width, Height);+ WindowState = WindowState.Maximized;+ }+ else+ {+ WindowState = WindowState.Normal;+ }+ }++ private double Clamp(double value, double min, double max) => Math.Max(min, Math.Min(max, value));private void TitleBar_MouseDown(object sender, MouseButtonEventArgs e){- if (e.LeftButton == MouseButtonState.Pressed)+ if (e.ChangedButton != MouseButton.Left || e.ClickCount == 2)+ {+ return;+ }++ if (WindowState == WindowState.Maximized)+ {+ _mouseDownWindowPoint = e.GetPosition(this);+ _prepareDragFromMax = true;+ }+ else{DragMove();}}- private void TitleBar_PreviewMouseDown(object sender, MouseButtonEventArgs e)+ private void TitleBar_MouseMove(object sender, MouseEventArgs e)+ {+ if (!_prepareDragFromMax)+ {+ return;+ }++ if (e.LeftButton != MouseButtonState.Pressed)+ {+ _prepareDragFromMax = false;+ return;+ }++ Point initialScreen = PointToScreen(_mouseDownWindowPoint);+ Point currentScreen = PointToScreen(e.GetPosition(this));+ Vector delta = currentScreen - initialScreen;++ if (Math.Abs(delta.X) > SystemParameters.MinimumHorizontalDragDistance || Math.Abs(delta.Y) > SystemParameters.MinimumVerticalDragDistance)+ {+ _prepareDragFromMax = false;++ 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;++ WindowState = WindowState.Normal;+ Width = restoreWidth;+ Height = restoreHeight;++ double left = currentScreen.X - restoreWidth * relX;+ double top = currentScreen.Y - _mouseDownWindowPoint.Y;++ double screenW = SystemParameters.PrimaryScreenWidth;+ double screenH = SystemParameters.PrimaryScreenHeight;+ left = Clamp(left, 0, Math.Max(0, screenW - restoreWidth));+ top = Clamp(top, 0, Math.Max(0, screenH - restoreHeight));++ Left = left;+ Top = top;++ Dispatcher.BeginInvoke((Action)(() => { DragMove(); }));+ }+ }++ private void TitleBar_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) => _prepareDragFromMax = false;++ private void TitleBar_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e){- if (e!.ClickCount == 2)+ if (e.ChangedButton != MouseButton.Left || e.ClickCount != 2)+ {+ return;+ }++ if (e.OriginalSource is DependencyObject source){- if (e.OriginalSource is DependencyObject source)+ DependencyObject current = source;+ while (current != null){- DependencyObject current = source;- while (current != null)+ if (current is ButtonBase){- if (current is ButtonBase)- {- return;- }-- current = VisualTreeHelper.GetParent(current);+ return;}++ current = VisualTreeHelper.GetParent(current);}- HandleWindowState();}- }+ bool wasMax = WindowState == WindowState.Maximized;++ HandleWindowState();++ if (wasMax && _lastNormalPosition.HasValue && _lastNormalSize.HasValue)+ {+ 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;+ }private void TitleButton_Click(object sender, RoutedEventArgs e){