Release v1.26.0

CITATION.cff

@@ -9,8 +9,8 @@ authors:
     website: "https://erikdarling.com"
 repository-code: "https://github.com/erikdarlingdata/PerformanceStudio"
 license: MIT
-version: "1.23.0"
-date-released: "2026-09-02"
+version: "1.26.0"
+date-released: "2026-09-16"
 keywords:
   - sql-server
   - execution-plan

src/Directory.Build.props

@@ -15,7 +15,7 @@
     Tests and server/ projects are outside src/ and are unaffected.
   -->
   <PropertyGroup>
-    <Version>1.25.0</Version>
+    <Version>1.26.0</Version>
     <Authors>Erik Darling</Authors>
     <Company>Darling Data LLC</Company>
     <Product>Performance Studio</Product>

src/PlanViewer.App/AboutWindow.axaml

@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="PlanViewer.App.AboutWindow"
         Title="About Performance Studio"
-        Width="480" Height="640"
+        Width="480" Height="400"
         CanResize="False"
         WindowStartupLocation="CenterOwner"
         Icon="avares://PlanViewer.App/EDD.ico"
@@ -65,66 +65,9 @@
                        Margin="0,4,0,0"/>
         </StackPanel>
 
-        <!-- MCP Settings -->
-        <StackPanel Grid.Row="4" Margin="0,0,0,12">
-            <TextBlock Text="Settings" FontWeight="SemiBold" FontSize="13"
-                       Foreground="{DynamicResource ForegroundBrush}" Margin="0,0,0,8"/>
-            <StackPanel Orientation="Horizontal" Spacing="12">
-                <CheckBox x:Name="McpEnabledCheckBox" Content="Enable MCP Server"
-                          FontSize="12" VerticalContentAlignment="Center"
-                          Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBlock Text="Port:" FontSize="12" VerticalAlignment="Center"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox x:Name="McpPortInput" Width="70" Height="28"
-                         Text="5152" FontSize="12" Padding="6,2"
-                         VerticalContentAlignment="Center"/>
-            </StackPanel>
-            <TextBlock Text="Restart the application after changing MCP settings."
-                       FontSize="11" Foreground="{DynamicResource ForegroundBrush}"
-                       Margin="0,4,0,0"/>
-            <StackPanel Orientation="Horizontal" Spacing="8" Margin="0,8,0,0">
-                <Button x:Name="CopyMcpCommandButton" Content="Copy MCP Command"
-                        Click="CopyMcpCommand_Click" Padding="10,4" FontSize="12"/>
-                <TextBlock x:Name="McpCopyStatus" FontSize="11" VerticalAlignment="Center"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-            </StackPanel>
-
-            <!-- Proxy Settings -->
-            <TextBlock Text="Proxy" FontWeight="SemiBold" FontSize="12"
-                       Foreground="{DynamicResource ForegroundBrush}" Margin="0,16,0,4"/>
-            <StackPanel Orientation="Horizontal" Spacing="12">
-                <RadioButton x:Name="ProxySystemRadio" GroupName="ProxyMode"
-                             Content="Use system proxy (Windows credentials)"
-                             FontSize="12" IsChecked="True"
-                             Foreground="{DynamicResource ForegroundBrush}"/>
-                <RadioButton x:Name="ProxyManualRadio" GroupName="ProxyMode"
-                             Content="Manual"
-                             FontSize="12"
-                             Foreground="{DynamicResource ForegroundBrush}"/>
-            </StackPanel>
-            <Grid x:Name="ProxyManualPanel" IsVisible="False"
-                  ColumnDefinitions="90,*" RowDefinitions="Auto,Auto,Auto"
-                  Margin="0,8,0,0" RowSpacing="6" ColumnSpacing="8">
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="Address:" FontSize="12"
-                           VerticalAlignment="Center"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox Grid.Row="0" Grid.Column="1" x:Name="ProxyAddressInput"
-                         Watermark="http://proxy.example.com:8080" FontSize="12"
-                         Padding="6,2" Height="28"/>
-                <TextBlock Grid.Row="1" Grid.Column="0" Text="Username:" FontSize="12"
-                           VerticalAlignment="Center"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox Grid.Row="1" Grid.Column="1" x:Name="ProxyUsernameInput"
-                         Watermark="DOMAIN\user" FontSize="12"
-                         Padding="6,2" Height="28"/>
-                <TextBlock Grid.Row="2" Grid.Column="0" Text="Password:" FontSize="12"
-                           VerticalAlignment="Center"
-                           Foreground="{DynamicResource ForegroundBrush}"/>
-                <TextBox Grid.Row="2" Grid.Column="1" x:Name="ProxyPasswordInput"
-                         PasswordChar="•" FontSize="12"
-                         Padding="6,2" Height="28"/>
-            </Grid>
-        </StackPanel>
+        <!-- MCP server and proxy configuration used to sit here. They are settings, not
+             information about the build, and nobody looks for a port number in an About box;
+             they now live under Settings > Integrations. -->
 
         <!-- Close -->
         <Button Grid.Row="5" Content="Close" Click="CloseButton_Click"

src/PlanViewer.App/AboutWindow.axaml.cs

@@ -12,7 +12,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using PlanViewer.App.Mcp;
 using PlanViewer.App.Services;
 using Velopack;
 
@@ -31,90 +30,11 @@ public AboutWindow()
         var version = Assembly.GetExecutingAssembly().GetName().Version;
         if (version != null)
             VersionText.Text = $"Version {version.Major}.{version.Minor}.{version.Build}";
-
-        // Load current MCP settings
-        var mcp = McpSettings.Load();
-        McpEnabledCheckBox.IsChecked = mcp.Enabled;
-        McpPortInput.Text = mcp.Port.ToString();
-
-        // Save on change
-        McpEnabledCheckBox.IsCheckedChanged += (_, _) => SaveMcpSettings();
-        McpPortInput.LostFocus += (_, _) => SaveMcpSettings();
-
-        // Load proxy settings. The password is intentionally NOT round-tripped
-        // through the UI — TextBox.PasswordChar only masks the glyph, the cleartext
-        // still lives in the visual/accessibility tree. We surface "(saved — leave
-        // blank to keep)" via the watermark instead, and only update the credential
-        // when the user types a new value.
-        var proxy = ProxySettings.Load();
-        _hasStoredProxyPassword = !string.IsNullOrEmpty(proxy.Password);
-        ProxySystemRadio.IsChecked = proxy.Mode == ProxyMode.System;
-        ProxyManualRadio.IsChecked = proxy.Mode == ProxyMode.Manual;
-        ProxyAddressInput.Text = proxy.Address;
-        ProxyUsernameInput.Text = proxy.Username;
-        ProxyPasswordInput.Watermark = _hasStoredProxyPassword
-            ? "(saved — leave blank to keep)"
-            : "";
-        ProxyManualPanel.IsVisible = proxy.Mode == ProxyMode.Manual;
-
-        // Both radios fire IsCheckedChanged on every selection (one going false,
-        // one going true). Only the now-checked one should drive the save —
-        // otherwise the credential write races itself.
-        void OnProxyRadioChanged(object? sender, RoutedEventArgs _)
-        {
-            if (sender is RadioButton rb && rb.IsChecked == true)
-            {
-                ProxyManualPanel.IsVisible = ProxyManualRadio.IsChecked == true;
-                SaveProxySettings();
-            }
-        }
-        ProxySystemRadio.IsCheckedChanged += OnProxyRadioChanged;
-        ProxyManualRadio.IsCheckedChanged += OnProxyRadioChanged;
-        ProxyAddressInput.LostFocus += (_, _) => SaveProxySettings();
-        ProxyUsernameInput.LostFocus += (_, _) => SaveProxySettings();
-        ProxyPasswordInput.LostFocus += (_, _) => SaveProxySettings();
-    }
-
-    private bool _hasStoredProxyPassword;
-
-    private void SaveMcpSettings()
-    {
-        Services.SettingsFile.Update(o =>
-        {
-            o["mcp_enabled"] = McpEnabledCheckBox.IsChecked == true;
-            o["mcp_port"] = int.TryParse(McpPortInput.Text, out var p) && p >= 1024 && p <= 65535 ? p : 5152;
-        });
-    }
-
-    private void SaveProxySettings()
-    {
-        var typedPassword = ProxyPasswordInput.Text ?? "";
-        var settings = new ProxySettings
-        {
-            Mode = ProxyManualRadio.IsChecked == true ? ProxyMode.Manual : ProxyMode.System,
-            Address = ProxyAddressInput.Text ?? "",
-            Username = ProxyUsernameInput.Text ?? "",
-            Password = typedPassword
-        };
-        // Empty textbox + an existing stored password means "keep what's there".
-        // Save() signals "leave the credential alone" with TouchCredential=false.
-        settings.TouchCredential = !(typedPassword.Length == 0 && _hasStoredProxyPassword);
-        settings.Save();
-        if (settings.TouchCredential)
-            _hasStoredProxyPassword = !string.IsNullOrEmpty(typedPassword);
     }
 
     private void GitHubLink_Click(object? sender, PointerPressedEventArgs e) => OpenUrl(GitHubUrl);
     private void ReportIssueLink_Click(object? sender, PointerPressedEventArgs e) => OpenUrl(IssuesUrl);
     private void DarlingDataLink_Click(object? sender, PointerPressedEventArgs e) => OpenUrl(DarlingDataUrl);
-    private async void CopyMcpCommand_Click(object? sender, RoutedEventArgs e)
-    {
-        var port = int.TryParse(McpPortInput.Text, out var p) && p >= 1024 && p <= 65535 ? p : 5152;
-        var command = $"claude mcp add --transport streamable-http --scope user performance-studio http://localhost:{port}/";
-        McpCopyStatus.Text = await ClipboardHelper.TrySetTextAsync(this, command)
-            ? "Copied to clipboard!"
-            : "Clipboard busy - try again";
-    }
 
     private string? _updateUrl;
     private UpdateManager? _velopackMgr;

src/PlanViewer.App/App.axaml

@@ -15,16 +15,32 @@
         <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
         <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml"/>
 
-        <!-- Fluent defaults AllowAutoHide to true, which collapses a scrollbar to a
-             sliver until it is hovered. That is a bad trade on a horizontal bar under
-             a wide grid or a long query: the thing you need to grab is a couple of
-             pixels tall until after you have found it. Full size everywhere. -->
+        <!-- Scrollbars are slim overlay rails that expand on hover. This half turns the
+             overlay on; the geometry that makes it grabbable is in Application.Resources
+             below, and neither half is correct without the other.
+
+             Fluent reserves layout space for a scrollbar whenever AllowAutoHide is false,
+             so a pane built from nested scrollers surrenders a strip per scroller. The
+             plan view was showing three horizontal bars stacked at once. With auto-hide
+             on, ScrollViewer's own theme spans the content presenter under both bars
+             (Grid.ColumnSpan and RowSpan go to 2), so bars float over content instead of
+             shoving it around.
+
+             #464 is why this is not simply "auto-hide back on". That issue was the mirror
+             complaint: Fluent's idle thumb is scaleX(0.125) of a 16px bar, which is 2
+             physical pixels, and the report said the thing you need to grab is "a couple
+             of pixels tall until after you have found it". Turning auto-hide off fixed the
+             grab and bought the stacking. Redefining the geometry buys both - see the
+             resources below for the arithmetic.
+
+             Set explicitly rather than left to the Fluent default, because the default is
+             precisely what #464 overrode here and the decision should be visible. -->
         <Style Selector="ScrollViewer">
-            <Setter Property="AllowAutoHide" Value="False"/>
+            <Setter Property="AllowAutoHide" Value="True"/>
         </Style>
 
         <Style Selector="ScrollBar">
-            <Setter Property="AllowAutoHide" Value="False"/>
+            <Setter Property="AllowAutoHide" Value="True"/>
         </Style>
 
         <!-- DataGrid does not scroll through a ScrollViewer, and the ScrollBar rule above
@@ -33,7 +49,7 @@
              the value it pushes down is the ATTACHED ScrollViewer property read off itself,
              so setting that here is what reaches the grids. -->
         <Style Selector="DataGrid">
-            <Setter Property="ScrollViewer.AllowAutoHide" Value="False"/>
+            <Setter Property="ScrollViewer.AllowAutoHide" Value="True"/>
         </Style>
     </Application.Styles>
 
@@ -43,6 +59,25 @@
                 <ResourceInclude Source="avares://PlanViewer.App/Themes/DarkTheme.axaml"/>
                 <ResourceInclude Source="avares://PlanViewer.App/Themes/BarChartConfig.axaml"/>
             </ResourceDictionary.MergedDictionaries>
+
+            <!-- Scrollbar geometry, overriding Fluent's own resources of these names.
+                 Application.Resources outranks resources a theme contributes through
+                 Application.Styles, which is the same lever DarkTheme pulls to repaint
+                 SystemAccentColor.
+
+                 Fluent's numbers are 16px with an idle scale of 0.125, so 2px of rail.
+                 These are 14px with an idle scale of 0.5, so 7px of rail that is always
+                 drawn and always grabbable, opening to the full 14px under the pointer.
+                 That is the macOS overlay-scrollbar shape, and 7 logical px stays workable
+                 at high display scaling where 2px did not.
+
+                 KEEP THESE IN STEP. The idle rail is ScrollBarSize times the scale factor,
+                 and it must not fall below 6px or #464 is back. Only the scale differs from
+                 Fluent's own resource; the translate is theirs, is applied in the scaled
+                 space, and merely holds the rail a hair off the edge. -->
+            <x:Double x:Key="ScrollBarSize">14</x:Double>
+            <TransformOperations x:Key="VerticalSmallScrollThumbScaleTransform">scaleX(0.5) translateX(-2px)</TransformOperations>
+            <TransformOperations x:Key="HorizontalSmallScrollThumbScaleTransform">scaleY(0.5) translateY(-2px)</TransformOperations>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

src/PlanViewer.App/Controls/ColumnFilterPopup.axaml.cs

@@ -36,10 +36,15 @@ public ColumnFilterPopup()
         OperatorComboBox.SelectedIndex = 0;
     }
 
-    public void Initialize(string columnName, ColumnFilterState? existingFilter, bool canSearchServer)
+    /// <summary>
+    /// Prepares the popup for one column. <paramref name="columnName"/> is the internal column id
+    /// the filter is keyed and evaluated by; <paramref name="displayName"/> is the grid header the
+    /// user actually sees, and is all that is shown in the popup.
+    /// </summary>
+    public void Initialize(string columnName, string displayName, ColumnFilterState? existingFilter, bool canSearchServer)
     {
         _currentColumnName = columnName;
-        HeaderText.Text = $"Filter: {columnName}";
+        HeaderText.Text = $"Filter: {(string.IsNullOrEmpty(displayName) ? columnName : displayName)}";
         SearchServerButton.IsVisible = canSearchServer;
 
         if (existingFilter?.IsActive == true)
@@ -55,9 +60,15 @@ public void Initialize(string columnName, ColumnFilterState? existingFilter, boo
         }
 
         UpdateValueVisibility();
-        ValueTextBox.Focus();
     }
 
+    /// <summary>
+    /// Puts the caret in the value box. Only works once the popup is open: before that this
+    /// control has no visual root and Focus() is a silent no-op, which is why Initialize
+    /// cannot do it — the caller focuses after opening the popup.
+    /// </summary>
+    internal void FocusValueBox() => ValueTextBox.Focus();
+
     private void UpdateValueVisibility()
     {
         var idx = OperatorComboBox.SelectedIndex;

src/PlanViewer.App/Controls/PlanViewerControl.Minimap.cs

@@ -35,6 +35,7 @@ private void OpenMinimapPanel()
         MinimapPanel.Width = _minimapWidth;
         MinimapPanel.Height = _minimapHeight;
         MinimapPanel.IsVisible = true;
+        MinimapToggleButton.Classes.Set("on", true);
         RenderMinimap();
     }
 
@@ -43,6 +44,9 @@ private void CloseMinimapPanel()
         MinimapPanel.IsVisible = false;
         _minimapDragging = false;
         _minimapResizing = false;
+        // Follows the panel, not the click: the minimap's own close button and clearing the plan
+        // both come through here without going near the toggle.
+        MinimapToggleButton.Classes.Set("on", false);
     }
 
     private void RenderMinimap()
@@ -461,9 +465,15 @@ private void ZoomToNode(PlanNode node)
         }
     }
 
+    /* Resize drags are measured against this control, NOT against MinimapPanel.
+
+       The panel is pinned to the bottom-right, so growing it moves its own top-left corner —
+       and the grip lives in that corner. Measured in the panel's own coordinates the grip would
+       therefore sit still while the pointer moved, and the drag would fight itself. This control
+       does not move, so deltas taken from it mean what they say. */
     private void MinimapResizeGrip_PointerPressed(object? sender, PointerPressedEventArgs e)
     {
-        var point = e.GetCurrentPoint(MinimapPanel);
+        var point = e.GetCurrentPoint(this);
         if (!point.Properties.IsLeftButtonPressed) return;
         _minimapResizing = true;
         _minimapResizeStart = point.Position;
@@ -476,11 +486,22 @@ private void MinimapResizeGrip_PointerPressed(object? sender, PointerPressedEven
     private void MinimapResizeGrip_PointerMoved(object? sender, PointerEventArgs e)
     {
         if (!_minimapResizing) return;
-        var current = e.GetPosition(MinimapPanel);
+
+        // Belt to PointerCaptureLost's braces: if the button is no longer down, the drag is over
+        // however it ended. Without this a stale flag turns an ordinary hover into a resize.
+        if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
+        {
+            _minimapResizing = false;
+            return;
+        }
+
+        var current = e.GetPosition(this);
+        // Dragging toward the top-left — away from the pinned corner — is what grows the panel,
+        // so the deltas subtract.
         var dx = current.X - _minimapResizeStart.X;
         var dy = current.Y - _minimapResizeStart.Y;
-        var newW = Math.Max(MinimapMinSize, Math.Min(MinimapMaxSize, _minimapResizeStartW + dx));
-        var newH = Math.Max(MinimapMinSize, Math.Min(MinimapMaxSize, _minimapResizeStartH + dy));
+        var newW = Math.Max(MinimapMinSize, Math.Min(MinimapMaxSize, _minimapResizeStartW - dx));
+        var newH = Math.Max(MinimapMinSize, Math.Min(MinimapMaxSize, _minimapResizeStartH - dy));
         MinimapPanel.Width = newW;
         MinimapPanel.Height = newH;
         _minimapWidth = newW;