only one expanded at a time

deansheather · deansheather · commit c5f360a050f1 · 2025-05-08T16:28:06.000+10:00
diff --git a/App/Controls/ExpandContent.xaml b/App/Controls/ExpandContent.xaml
@@ -18,16 +18,6 @@
             <VisualStateGroup>
                 <VisualState x:Name="ExpandedState">
                     <Storyboard>
-                        <ObjectAnimationUsingKeyFrames
-                            Storyboard.TargetName="CollapsiblePanel"
-                            Storyboard.TargetProperty="Visibility">
-
-                            <DiscreteObjectKeyFrame KeyTime="0">
-                                <DiscreteObjectKeyFrame.Value>
-                                    <Visibility>Visible</Visibility>
-                                </DiscreteObjectKeyFrame.Value>
-                            </DiscreteObjectKeyFrame>
-                        </ObjectAnimationUsingKeyFrames>
                         <DoubleAnimation
                             Storyboard.TargetName="CollapsiblePanel"
                             Storyboard.TargetProperty="Opacity"
diff --git a/App/ViewModels/TrayWindowViewModel.cs b/App/ViewModels/TrayWindowViewModel.cs
@@ -190,6 +190,16 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
                 credentialModel.CoderUrl,
                 workspace.Name));
 
+        foreach (var agent in agents)
+            agent.PropertyChanged += (_, args) =>
+            {
+                // When an agent is expanded:
+                if (args.PropertyName == nameof(AgentViewModel.IsExpanded) && agent.IsExpanded)
+                    // Collapse every other agent.
+                    foreach (var otherAgent in Agents.Where(a => a.Id != agent.Id && a.IsExpanded))
+                        otherAgent.IsExpanded = false;
+            };
+
         // Sort by status green, red, gray, then by hostname.
         ModelUpdate.ApplyLists(Agents, agents, (a, b) =>
         {
diff --git a/App/Views/Pages/TrayWindowMainPage.xaml b/App/Views/Pages/TrayWindowMainPage.xaml
@@ -232,16 +232,22 @@
                         </Grid>
 
                         <controls:ExpandContent IsOpen="{x:Bind IsExpanded, Mode=OneWay}">
-                            <TextBlock
-                                Text="{x:Bind ExpandAppsMessage, Mode=OneWay}"
-                                Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
-                                Margin="10,8,10,16"
-                                TextAlignment="Center"
-                                Visibility="{x:Bind ShowExpandAppsMessage, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
+                            <Grid
+                                Height="34"
+                                Visibility="{x:Bind ShowExpandAppsMessage, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+
+                                <TextBlock
+                                    Text="{x:Bind ExpandAppsMessage, Mode=OneWay}"
+                                    Foreground="{ThemeResource SystemControlForegroundBaseMediumBrush}"
+                                    TextAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Margin="0,-1,0,0" />
+                            </Grid>
 
                             <ItemsRepeater
                                 ItemsSource="{x:Bind VisibleApps, Mode=OneWay}"
                                 Visibility="{x:Bind ShowExpandAppsMessage, Converter={StaticResource InverseBoolToVisibilityConverter}, Mode=OneWay}"
+                                Height="34"
                                 Margin="17,0">
 
                                 <ItemsRepeater.Layout>
diff --git a/App/Views/TrayWindow.xaml.cs b/App/Views/TrayWindow.xaml.cs
@@ -25,6 +25,7 @@ public sealed partial class TrayWindow : Window
     private const int WIDTH = 300;
 
     private NativeApi.POINT? _lastActivatePosition;
+    private int _maxHeightSinceLastActivation;
 
     private readonly IRpcController _rpcController;
     private readonly ICredentialManager _credentialManager;
@@ -139,30 +140,22 @@ public void SetRootFrame(Page page)
 
     private void RootFrame_SizeChanged(object sender, SizedFrameEventArgs e)
     {
-        ResizeWindow(e.NewSize.Height);
-        MoveWindow();
+        MoveAndResize(e.NewSize.Height);
     }
 
-    private void ResizeWindow()
+    private void MoveAndResize(double height)
     {
-        ResizeWindow(RootFrame.GetContentSize().Height);
-    }
-
-    private void ResizeWindow(double height)
-    {
-        if (height <= 0) height = 100; // will be resolved next frame typically
-
-        var scale = DisplayScale.WindowScale(this);
-        var newWidth = (int)(WIDTH * scale);
-        var newHeight = (int)(height * scale);
-        AppWindow.Resize(new SizeInt32(newWidth, newHeight));
+        var size = CalculateWindowSize(height);
+        var pos = CalculateWindowPosition(size);
+        var rect = new RectInt32(pos.X, pos.Y, size.Width, size.Height);
+        AppWindow.MoveAndResize(rect);
     }
 
     private void MoveResizeAndActivate()
     {
         SaveCursorPos();
-        ResizeWindow();
-        MoveWindow();
+        _maxHeightSinceLastActivation = 0;
+        MoveAndResize(RootFrame.GetContentSize().Height);
         AppWindow.Show();
         NativeApi.SetForegroundWindow(WindowNative.GetWindowHandle(this));
     }
@@ -179,15 +172,33 @@ private void SaveCursorPos()
             _lastActivatePosition = null;
     }
 
-    private void MoveWindow()
+    private SizeInt32 CalculateWindowSize(double height)
     {
-        AppWindow.Move(GetWindowPosition());
+        if (height <= 0) height = 100; // will be resolved next frame typically
+
+        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);
     }
 
-    private PointInt32 GetWindowPosition()
+    private PointInt32 CalculateWindowPosition(SizeInt32 size)
     {
-        var height = AppWindow.Size.Height;
-        var width = AppWindow.Size.Width;
+        var width = size.Width;
+        var height = size.Height;
+        // For positioning purposes, pretend the window is the maximum size it
+        // has been since it was last activated. This has the affect of
+        // allowing the window to move up to accomodate more content, but
+        // prevents it from moving back down when the window shrinks again.
+        //
+        // Prevents a lot of jittery behavior with app drawers.
+        if (height < _maxHeightSinceLastActivation)
+            height = _maxHeightSinceLastActivation;
+
         var cursorPosition = _lastActivatePosition;
         if (cursorPosition is null)
         {
