cleanup of changes

Author: ibetitsmike

App/Controls/ExpandContent.xaml

@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <UserControl
     x:Class="Coder.Desktop.App.Controls.ExpandContent"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:toolkit="using:CommunityToolkit.WinUI">
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:toolkit="using:CommunityToolkit.WinUI"
+    mc:Ignorable="d">
 
-    <Grid>
-        <Grid x:Name="CollapsiblePanel"
-              Visibility="Collapsed"
-              Opacity="0"
-              MaxHeight="0"
-              toolkit:UIElementExtensions.ClipToBounds="True">
+        <Grid>
+        <Grid x:Name="CollapsiblePanel" Opacity="0" Visibility="Collapsed" MaxHeight="0" toolkit:UIElementExtensions.ClipToBounds="True">
 
             <Grid.RenderTransform>
-                <TranslateTransform x:Name="Slide" Y="-16"/>
+                <TranslateTransform x:Name="SlideTransform" Y="-16"/>
             </Grid.RenderTransform>
         </Grid>
 
@@ -27,7 +28,7 @@
                         <DoubleAnimation Storyboard.TargetName="CollapsiblePanel"
                                          Storyboard.TargetProperty="Opacity" BeginTime="0:0:0.16"
                                          To="1" Duration="0:0:0.16"/>
-                        <DoubleAnimation Storyboard.TargetName="Slide"
+                        <DoubleAnimation Storyboard.TargetName="SlideTransform"
                                          Storyboard.TargetProperty="Y" BeginTime="0:0:0.16"
                                          To="0" Duration="0:0:0.16"/>
                     </Storyboard>
@@ -42,7 +43,7 @@
                         <DoubleAnimation Storyboard.TargetName="CollapsiblePanel"
                                          Storyboard.TargetProperty="Opacity"
                                          To="0" Duration="0:0:0.16"/>
-                        <DoubleAnimation Storyboard.TargetName="Slide"
+                        <DoubleAnimation Storyboard.TargetName="SlideTransform"
                                          Storyboard.TargetProperty="Y"
                                          To="-16" Duration="0:0:0.16"/>
                     </Storyboard>

App/ViewModels/TrayWindowViewModel.cs

@@ -362,8 +362,6 @@ private void ShowFileSyncListWindow()
     [RelayCommand]
     private async Task SignOut()
     {
-        //if (VpnLifecycle is not VpnLifecycle.Stopped)
-        //    return;
         await _rpcController.StopVpn();
         await _credentialManager.ClearCredentials();
     }

App/Views/TrayWindow.xaml.cs

@@ -34,7 +34,6 @@ public sealed partial class TrayWindow : Window
     private bool _resizeInProgress;
 
     private NativeApi.POINT? _lastActivatePosition;
-    private int _maxHeightSinceLastActivation;
 
     private readonly IRpcController _rpcController;
     private readonly ICredentialManager _credentialManager;
@@ -209,7 +208,6 @@ private void MoveAndResize(double height)
     private void MoveResizeAndActivate()
     {
         SaveCursorPos();
-        _maxHeightSinceLastActivation = 0;
         MoveAndResize(RootFrame.GetContentSize().Height);
         AppWindow.Show();
         NativeApi.SetForegroundWindow(WindowNative.GetWindowHandle(this));
@@ -234,9 +232,6 @@ private SizeInt32 CalculateWindowSize(double height)
         var scale = DisplayScale.WindowScale(this);
         var newWidth = (int)(WIDTH * scale);
         var newHeight = (int)(height * scale);
-        // Store the maximum height we've seen for positioning purposes.
-        if (newHeight > _maxHeightSinceLastActivation)
-            _maxHeightSinceLastActivation = newHeight;
 
         return new SizeInt32(newWidth, newHeight);
     }