From 710c49d354e3a5564de8b740a510ca10ee142ecf Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Sun, 18 Oct 2026 07:46:47 +0700
Subject: [PATCH 1/2] fix(nav): return to five primary tabs with specialist
 tools menu and remove truncated SCL status pills

---
 src/ProcessBus.App.Wpf/MainWindow.xaml | 104 ++++++++++++-------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/ProcessBus.App.Wpf/MainWindow.xaml b/src/ProcessBus.App.Wpf/MainWindow.xaml
index 029adada..c39a6dab 100644
--- a/src/ProcessBus.App.Wpf/MainWindow.xaml
+++ b/src/ProcessBus.App.Wpf/MainWindow.xaml
@@ -173,7 +173,7 @@
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="18"/>
+                                <ColumnDefinition x:Name="HeaderIdentityGap" Width="18"/>
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
@@ -183,7 +183,7 @@
                             Orientation="Horizontal"
                             VerticalAlignment="Center">
 
-                                <Border Width="38"
+                                <Border x:Name="HeaderProductLogo" Width="38"
                             Height="38"
                             CornerRadius="8"
                             Background="#102A43"
@@ -196,12 +196,12 @@
                                 </Border>
 
                                 <StackPanel VerticalAlignment="Center">
-                                    <TextBlock Text="Process Bus Insight"
+                                    <TextBlock x:Name="HeaderProductTitle" Text="Process Bus Insight"
                                    FontSize="15"
                                    FontWeight="SemiBold"
                                    Foreground="{StaticResource TextPrimaryBrush}"/>
 
-                                    <TextBlock Text="IEC 61850 · SV / GOOSE / PTP"
+                                    <TextBlock x:Name="HeaderProductSubtitle" Text="IEC 61850 · SV / GOOSE / PTP"
                                    Margin="0,2,0,0"
                                    FontSize="11"
                                    Foreground="#7FA8CC"/>
@@ -317,48 +317,19 @@
                                     </StackPanel>
                                 </RadioButton>
 
-                                <RadioButton x:Name="FramesWorkspaceButton"
-                                             GroupName="WorkspaceTabs"
-                                 Style="{StaticResource AnalyzerTabButtonStyle}"
-                                 Tag="4"
-                                 Click="WorkspaceTabButton_Click">
-                                    <StackPanel Orientation="Horizontal" IsHitTestVisible="False">
-                                        <Viewbox Width="14" Height="14" Margin="0,0,8,0" VerticalAlignment="Center">
-                                            <Path Style="{StaticResource NavVectorIconStyle}" Data="{StaticResource IconDiagnosticsGeometry}"/>
-                                        </Viewbox>
-                                        <TextBlock Text="Validation"
-                                       FontWeight="SemiBold"
-                                       Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=RadioButton}}"/>
-                                    </StackPanel>
-                                </RadioButton>
-
-                                <RadioButton x:Name="AdvancedWorkspaceButton"
-                                             GroupName="WorkspaceTabs"
-                                 Style="{StaticResource AnalyzerTabButtonStyle}"
-                                 Tag="6"
-                                 Click="WorkspaceTabButton_Click">
-                                    <StackPanel Orientation="Horizontal" IsHitTestVisible="False">
-                                        <Viewbox Width="14" Height="14" Margin="0,0,8,0" VerticalAlignment="Center">
-                                            <Path Style="{StaticResource NavVectorIconStyle}" Data="{StaticResource IconFramesGeometry}"/>
-                                        </Viewbox>
-                                        <TextBlock Text="Advanced"
-                                       FontWeight="SemiBold"
-                                       Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=RadioButton}}"/>
-                                    </StackPanel>
-                                </RadioButton>
                                     </StackPanel>
                                 </Grid>
                             </Border>
 
                             <!-- Fixed 20-DIP breathing room between the workspace switcher and adapter.
                                  Never let the tab pill visually merge into the adapter frame. -->
-                            <StackPanel Grid.Column="3"
+                            <StackPanel x:Name="HeaderCaptureToolbar" Grid.Column="3"
                                         Margin="20,0,0,0"
                                         Orientation="Horizontal"
                                         VerticalAlignment="Center"
                                         HorizontalAlignment="Right">
 
-                                <ComboBox Width="250"
+                                <ComboBox x:Name="HeaderAdapterComboBox" Width="250"
                                           Style="{StaticResource ToolbarAdapterComboBoxStyle}"
                                           IsEnabled="{Binding IsRunning, Converter={StaticResource InverseBooleanConverter}}"
                                           ItemsSource="{Binding Adapters}"
@@ -446,6 +417,49 @@
                                     </Button.Style>
                                 </Button>
 
+                                <!-- Specialist tools are available without crowding the primary navigator. -->
+                                <Button x:Name="ToolsWorkspaceButton"
+                                        Style="{StaticResource HeaderCircleButtonStyle}"
+                                        Width="34" Height="34" Margin="7,0,0,0"
+                                        ToolTip="More tools: Validation and Advanced"
+                                        Click="WorkspaceToolsButton_Click"
+                                        AutomationProperties.Name="More tools: Validation and Advanced">
+                                    <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="15"
+                                               Text="&#xE713;" Foreground="#BED7EA"
+                                               HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    <Button.ContextMenu>
+                                        <ContextMenu Background="#0C2032" BorderBrush="#315270"
+                                                     BorderThickness="1" Padding="5" Placement="Bottom">
+                                            <ContextMenu.Resources>
+                                                <Style TargetType="MenuItem">
+                                                    <Setter Property="Foreground" Value="#E8F5FF"/>
+                                                    <Setter Property="FontSize" Value="12"/>
+                                                    <Setter Property="Cursor" Value="Hand"/>
+                                                    <Setter Property="Template">
+                                                        <Setter.Value>
+                                                            <ControlTemplate TargetType="MenuItem">
+                                                                <Border x:Name="MenuSurface" Background="Transparent"
+                                                                        CornerRadius="5" Padding="14,9" MinWidth="142">
+                                                                    <ContentPresenter ContentSource="Header"/>
+                                                                </Border>
+                                                                <ControlTemplate.Triggers>
+                                                                    <Trigger Property="IsHighlighted" Value="True">
+                                                                        <Setter TargetName="MenuSurface" Property="Background" Value="#174B77"/>
+                                                                    </Trigger>
+                                                                </ControlTemplate.Triggers>
+                                                            </ControlTemplate>
+                                                        </Setter.Value>
+                                                    </Setter>
+                                                </Style>
+                                            </ContextMenu.Resources>
+                                            <MenuItem Header="Validation" Tag="4" Click="WorkspaceToolMenuItem_Click"
+                                                      ToolTip="Compare SCL engineering with live traffic"/>
+                                            <MenuItem Header="Advanced" Tag="6" Click="WorkspaceToolMenuItem_Click"
+                                                      ToolTip="Raw packet decode, estimator and performance"/>
+                                        </ContextMenu>
+                                    </Button.ContextMenu>
+                                </Button>
+
                                 <Button Style="{StaticResource HeaderCircleButtonStyle}"
                                         Width="34"
                                         Height="34"
@@ -3984,15 +3998,7 @@
                                                                Foreground="#8FAAC3"
                                                                FontSize="11"/>
                                                 </StackPanel>
-                                                <Border HorizontalAlignment="Right"
-                                                        VerticalAlignment="Top"
-                                                        Background="#071A2B"
-                                                        BorderBrush="#1F4E76"
-                                                        BorderThickness="1"
-                                                        CornerRadius="10"
-                                                        Padding="10,5">
-                                                    <TextBlock Text="{Binding SclWorkspaceStatusText}" Foreground="#8FCBFF" FontSize="10.5" FontWeight="SemiBold" MaxWidth="180" TextTrimming="CharacterEllipsis" ToolTip="{Binding SclWorkspaceStatusText}"/>
-                                                </Border>
+                                                
                                             </DockPanel>
 
                                             <DataGrid Grid.Row="2"
@@ -4094,15 +4100,7 @@
                                                                Foreground="#8FAAC3"
                                                                FontSize="11"/>
                                                 </StackPanel>
-                                                <Border HorizontalAlignment="Right"
-                                                        VerticalAlignment="Top"
-                                                        Background="#071A2B"
-                                                        BorderBrush="#1F4E76"
-                                                        BorderThickness="1"
-                                                        CornerRadius="10"
-                                                        Padding="10,5">
-                                                    <TextBlock Text="{Binding SclBindingSummaryText}" Foreground="#F6D781" FontSize="10.5" FontWeight="SemiBold" MaxWidth="230" TextTrimming="CharacterEllipsis" ToolTip="{Binding SclBindingSummaryText}"/>
-                                                </Border>
+                                                
                                             </DockPanel>
 
                                             <DataGrid Grid.Row="6"

From 4b0295fc153aeae2e780299027597166ed42c646 Mon Sep 17 00:00:00 2001
From: Ari Sulistiono <ari.sulistiono@gmail.com>
Date: Sun, 18 Oct 2026 07:47:32 +0700
Subject: [PATCH 2/2] fix(nav): specialist menu navigation, selected state
 synchronization and responsive 1240px header layout

---
 src/ProcessBus.App.Wpf/MainWindow.xaml.cs | 62 +++++++++++++++++++++--
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/src/ProcessBus.App.Wpf/MainWindow.xaml.cs b/src/ProcessBus.App.Wpf/MainWindow.xaml.cs
index b12ed54b..1ed73670 100644
--- a/src/ProcessBus.App.Wpf/MainWindow.xaml.cs
+++ b/src/ProcessBus.App.Wpf/MainWindow.xaml.cs
@@ -22,7 +22,8 @@ public MainWindow()
         InitializeComponent();
         if (DataContext is MainWindowViewModel viewModel) { }
 
-        Loaded += (_, _) => UpdateWorkspaceActivePill(animate: false);
+        Loaded += (_, _) => { UpdateHeaderDensity(); UpdateWorkspaceActivePill(animate: false); };
+        SizeChanged += (_, _) => UpdateHeaderDensity();
         Closing += MainWindow_Closing;
         Closed += (_, _) => Application.Current?.Shutdown();
         WorkspaceSegmentRail.SizeChanged += (_, _) => UpdateWorkspaceActivePill(animate: false);
@@ -86,6 +87,45 @@ private void LockedFeature_Click(object sender, RoutedEventArgs e)
             MessageBoxImage.Information);
     }
 
+    // Specialist pages are preserved but intentionally excluded from the operator tab rail.
+    private void WorkspaceToolsButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (ToolsWorkspaceButton.ContextMenu is not { } menu)
+            return;
+
+        menu.PlacementTarget = ToolsWorkspaceButton;
+        menu.IsOpen = true;
+    }
+
+    private void WorkspaceToolMenuItem_Click(object sender, RoutedEventArgs e)
+        => WorkspaceTabButton_Click(sender, e);
+
+    // The original header had seven fixed-width tabs and clipped at desktop sizes.
+    // Choose compact dimensions only on narrow windows; no data/capture refresh.
+    private bool _compactHeader;
+    private void UpdateHeaderDensity()
+    {
+        if (!IsLoaded || HeaderAdapterComboBox is null || WorkspaceSegmentButtons is null)
+            return;
+
+        var compact = ActualWidth < 1450;
+        if (_compactHeader == compact && HeaderAdapterComboBox.Width == (compact ? 180 : 250))
+            return;
+
+        _compactHeader = compact;
+        HeaderProductSubtitle.Visibility = compact ? Visibility.Collapsed : Visibility.Visible;
+        HeaderProductLogo.Width = compact ? 32 : 38;
+        HeaderProductLogo.Height = compact ? 32 : 38;
+        HeaderProductTitle.FontSize = compact ? 13 : 15;
+        HeaderIdentityGap.Width = new GridLength(compact ? 12 : 18);
+        HeaderAdapterComboBox.Width = compact ? 180 : 250;
+        HeaderCaptureToolbar.Margin = new Thickness(compact ? 14 : 20, 0, 0, 0);
+        foreach (var tab in WorkspaceSegmentButtons.Children.OfType<RadioButton>())
+            tab.Width = compact ? 94 : 112;
+
+        UpdateWorkspaceActivePill(animate: false);
+    }
+
     private void WorkspaceTabButton_Click(object sender, RoutedEventArgs e)
     {
         if (sender is not FrameworkElement { Tag: string tag } ||
@@ -138,10 +178,24 @@ WorkspaceActivePillTransform is null ||
             WorkspaceSegmentButtons is null)
             return;
 
-        var selectedButton = WorkspaceSegmentButtons.Children
-            .OfType<RadioButton>()
-            .FirstOrDefault(button => string.Equals(button.Tag?.ToString(), WorkspaceTabs.SelectedIndex.ToString(), StringComparison.Ordinal));
+        var primaryTabs = WorkspaceSegmentButtons.Children.OfType<RadioButton>().ToArray();
+        var selectedButton = primaryTabs.FirstOrDefault(button =>
+            string.Equals(button.Tag?.ToString(), WorkspaceTabs.SelectedIndex.ToString(), StringComparison.Ordinal));
+
+        // Tab selection may also originate in the VM, keyboard navigation, or Tools.
+        foreach (var tab in primaryTabs)
+            tab.IsChecked = ReferenceEquals(tab, selectedButton);
+
+        bool inTools = WorkspaceTabs.SelectedIndex is 4 or 6;
+        ToolsWorkspaceButton.ToolTip = inTools
+            ? (WorkspaceTabs.SelectedIndex == 4 ? "Validation · select another tool" : "Advanced · select another tool")
+            : "More tools: Validation and Advanced";
+        ToolsWorkspaceButton.Background = inTools
+            ? new SolidColorBrush(Color.FromRgb(22, 76, 119))
+            : Brushes.Transparent;
 
+        // No blue primary-tab pill should remain selected when a specialist page is open.
+        WorkspaceActivePill.Visibility = selectedButton is null ? Visibility.Collapsed : Visibility.Visible;
         if (selectedButton is null || selectedButton.ActualWidth <= 0)
             return;