From 754c3cee4ce8f66e687d15f9b1f96d87f9bb8639 Mon Sep 17 00:00:00 2001
From: Raphire <9938813+Raphire@users.noreply.github.com>
Date: Wed, 18 Feb 2026 00:26:10 +0100
Subject: [PATCH] Improve app page with table-like structure

---
 Schemas/MainWindow.xaml                    | 71 +++++++++++++---
 Scripts/FileIO/LoadAppsDetailsFromJson.ps1 |  2 +
 Scripts/GUI/SetWindowThemeResources.ps1    |  6 ++
 Scripts/GUI/Show-MainWindow.ps1            | 94 ++++++++++++++++------
 4 files changed, 138 insertions(+), 35 deletions(-)

diff --git a/Schemas/MainWindow.xaml b/Schemas/MainWindow.xaml
index 5289de7..ef069d8 100644
--- a/Schemas/MainWindow.xaml
+++ b/Schemas/MainWindow.xaml
@@ -1,8 +1,8 @@
 <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Win11Debloat" 
-        MinWidth="1024" MinHeight="600"
-        MaxWidth="1280"
+        MinWidth="1080" MinHeight="600"
+        MaxWidth="1400"
         ResizeMode="CanResize" 
         SnapsToDevicePixels="True"
         WindowStartupLocation="CenterScreen"
@@ -420,8 +420,35 @@
         <!-- CheckBox style for apps panels -->
         <Style x:Key="AppsPanelCheckBoxStyle" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
             <Setter Property="Margin" Value="2,3,2,3"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
 
+        <!-- TextBlock style for App ID column in apps table -->
+        <Style x:Key="AppIdTextStyle" TargetType="TextBlock">
+            <Setter Property="Foreground" Value="{DynamicResource AppIdColor}"/>
+            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+
+        <!-- TextBlock style for App Name column in apps table -->
+        <Style x:Key="AppNameTextStyle" TargetType="TextBlock">
+            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
+
+        <!-- TextBlock style for Description column in apps table -->
+        <Style x:Key="AppDescTextStyle" TargetType="TextBlock">
+            <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="Margin" Value="8,0,8,0"/>
+        </Style>
+
+        <!-- Column widths for the apps table row grid -->
+        <GridLength x:Key="AppTableCol0Width">160</GridLength>
+        <GridLength x:Key="AppTableCol1Width">1*</GridLength>
+        <GridLength x:Key="AppTableCol2Width">286</GridLength>
+
         <!-- Button Style -->
         <Style x:Key="PrimaryButtonStyle" TargetType="Button">
             <Setter Property="Background" Value="{DynamicResource ButtonBg}"/>
@@ -826,16 +853,36 @@
                             </Grid.RowDefinitions>
                             
                             <!-- Apps List -->
-                            <Border Grid.Row="0" BorderBrush="{DynamicResource BorderColor}" CornerRadius="4" BorderThickness="1" Margin="20,0,20,10" Background="{DynamicResource CardBgColor}">
-                                <Grid>
-                                    <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                        <StackPanel x:Name="AppSelectionPanel" Margin="8"/>
-                                    </ScrollViewer>
-                                    <Border x:Name="LoadingAppsIndicator" CornerRadius="4" Background="{DynamicResource ScrollBarThumbColor}" Opacity="0.8" Visibility="Collapsed">
-                                        <TextBlock Text="Loading apps..." FontSize="16" FontWeight="SemiBold" Foreground="{DynamicResource FgColor}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                                    </Border>
-                                </Grid>
-                            </Border>
+                            <Grid Grid.Row="0" Margin="20,0,20,10">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <!-- Column Headers -->
+                                <Border Grid.Row="0" Background="{DynamicResource ComboBgColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1,1,1,0" CornerRadius="4,4,0,0">
+                                    <Grid Margin="26,6,8,7">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="160"/>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="300"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="0" Text="App Name" FontWeight="SemiBold" FontSize="14" Foreground="{DynamicResource FgColor}" Margin="16,0,0,0"/>
+                                        <TextBlock Grid.Column="1" Text="Description" FontWeight="SemiBold" FontSize="14" Foreground="{DynamicResource FgColor}" Margin="24,0,0,0"/>
+                                        <TextBlock Grid.Column="2" Text="App ID" FontWeight="SemiBold" FontSize="14" Foreground="{DynamicResource FgColor}"/>
+                                    </Grid>
+                                </Border>
+                                <!-- Apps content -->
+                                <Border Grid.Row="1" BorderBrush="{DynamicResource BorderColor}" CornerRadius="0,0,4,4" BorderThickness="1" Background="{DynamicResource CardBgColor}">
+                                    <Grid>
+                                        <ScrollViewer VerticalScrollBarVisibility="Visible">
+                                            <StackPanel x:Name="AppSelectionPanel" Margin="10,4,0,4"/>
+                                        </ScrollViewer>
+                                        <Border x:Name="LoadingAppsIndicator" CornerRadius="0,0,4,4" Background="{DynamicResource CardBgColor}" Opacity="0.8" Visibility="Collapsed">
+                                            <TextBlock Text="Loading apps..." FontSize="16" FontWeight="SemiBold" Foreground="{DynamicResource FgColor}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                    </Grid>
+                                </Border>
+                            </Grid>
 
                             <!-- Status Info -->
                             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="20,0,20,0">
diff --git a/Scripts/FileIO/LoadAppsDetailsFromJson.ps1 b/Scripts/FileIO/LoadAppsDetailsFromJson.ps1
index 1e297df..ba6586e 100644
--- a/Scripts/FileIO/LoadAppsDetailsFromJson.ps1
+++ b/Scripts/FileIO/LoadAppsDetailsFromJson.ps1
@@ -28,11 +28,13 @@ function LoadAppsDetailsFromJson {
             }
         }
 
+        $friendlyName = if ($appData.FriendlyName) { $appData.FriendlyName } else { $appId }
         $displayName = if ($appData.FriendlyName) { "$($appData.FriendlyName) ($appId)" } else { $appId }
         $isChecked = if ($InitialCheckedFromJson) { $appData.SelectedByDefault } else { $false }
 
         $apps += [PSCustomObject]@{
             AppId = $appId
+            FriendlyName = $friendlyName
             DisplayName = $displayName
             IsChecked = $isChecked
             Description = $appData.Description
diff --git a/Scripts/GUI/SetWindowThemeResources.ps1 b/Scripts/GUI/SetWindowThemeResources.ps1
index 9bb87aa..97c911d 100644
--- a/Scripts/GUI/SetWindowThemeResources.ps1
+++ b/Scripts/GUI/SetWindowThemeResources.ps1
@@ -30,6 +30,9 @@ function SetWindowThemeResources {
         $window.Resources.Add("InputFocusColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#1f1f1f")))
         $window.Resources.Add("ScrollBarThumbColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#3d3d3d")))
         $window.Resources.Add("ScrollBarThumbHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#4b4b4b")))
+        $window.Resources.Add("AppIdColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#afafaf")))
+        $window.Resources.Add("SearchHighlightColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#4A4A2A")))
+        $window.Resources.Add("SearchHighlightActiveColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#8A7000")))
     }
     else {
         $window.Resources.Add("BgColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#f3f3f3")))
@@ -56,6 +59,9 @@ function SetWindowThemeResources {
         $window.Resources.Add("InputFocusColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#fbfbfb")))
         $window.Resources.Add("ScrollBarThumbColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#b9b9b9")))
         $window.Resources.Add("ScrollBarThumbHoverColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#8b8b8b")))
+        $window.Resources.Add("AppIdColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#666666")))
+        $window.Resources.Add("SearchHighlightColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFF4CE")))
+        $window.Resources.Add("SearchHighlightActiveColor", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFD966")))
     }
 
     $window.Resources.Add("ButtonBg", [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#0067c0")))
diff --git a/Scripts/GUI/Show-MainWindow.ps1 b/Scripts/GUI/Show-MainWindow.ps1
index c90e532..729d24e 100644
--- a/Scripts/GUI/Show-MainWindow.ps1
+++ b/Scripts/GUI/Show-MainWindow.ps1
@@ -534,16 +534,45 @@ function Show-MainWindow {
         $script:MainWindowLastSelectedCheckbox = $null
 
         # Sort apps alphabetically and add to panel
-        $appsToAdd | Sort-Object -Property DisplayName | ForEach-Object {
+        $appsToAdd | Sort-Object -Property FriendlyName | ForEach-Object {
             $checkbox = New-Object System.Windows.Controls.CheckBox
-            $checkbox.Content = $_.DisplayName
-            $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $_.DisplayName)
+            $checkbox.SetValue([System.Windows.Automation.AutomationProperties]::NameProperty, $_.FriendlyName)
             $checkbox.Tag = $_.AppId
             $checkbox.IsChecked = $_.IsChecked
-            $checkbox.ToolTip = $_.Description
             $checkbox.Style = $window.Resources["AppsPanelCheckBoxStyle"]
-            
+
+            # Build table row content: App Name | Description | App ID
+            $row = New-Object System.Windows.Controls.Grid
+            $c0 = New-Object System.Windows.Controls.ColumnDefinition; $c0.Width = [System.Windows.GridLength]::new(160)
+            $c1 = New-Object System.Windows.Controls.ColumnDefinition; $c1.Width = [System.Windows.GridLength]::new(1, [System.Windows.GridUnitType]::Star)
+            $c2 = New-Object System.Windows.Controls.ColumnDefinition; $c2.Width = [System.Windows.GridLength]::new(286)
+            $row.ColumnDefinitions.Add($c0); $row.ColumnDefinitions.Add($c1); $row.ColumnDefinitions.Add($c2)
+
+            $tbName = New-Object System.Windows.Controls.TextBlock
+            $tbName.Text = $_.FriendlyName
+            $tbName.Style = $window.Resources["AppNameTextStyle"]
+            [System.Windows.Controls.Grid]::SetColumn($tbName, 0)
+
+            $tbDesc = New-Object System.Windows.Controls.TextBlock
+            $tbDesc.Text = $_.Description
+            $tbDesc.Style = $window.Resources["AppDescTextStyle"]
+            $tbDesc.ToolTip = $_.Description
+            [System.Windows.Controls.Grid]::SetColumn($tbDesc, 1)
+
+            $tbId = New-Object System.Windows.Controls.TextBlock
+            $tbId.Text = $_.AppId
+            $tbId.Style = $window.Resources["AppIdTextStyle"]
+            $tbId.ToolTip = $_.AppId
+            [System.Windows.Controls.Grid]::SetColumn($tbId, 2)
+
+            $row.Children.Add($tbName) | Out-Null
+            $row.Children.Add($tbDesc) | Out-Null
+            $row.Children.Add($tbId) | Out-Null
+            $checkbox.Content = $row
+
             # Store metadata in checkbox for later use
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name "AppName" -Value $_.FriendlyName
+            Add-Member -InputObject $checkbox -MemberType NoteProperty -Name "AppDescription" -Value $_.Description
             Add-Member -InputObject $checkbox -MemberType NoteProperty -Name "SelectedByDefault" -Value $_.SelectedByDefault
             
             # Add event handler to update status
@@ -674,16 +703,6 @@ function Show-MainWindow {
         }
     })
 
-    # Shared search highlighting configuration
-    $script:SearchHighlightColor = [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#FFF4CE"))
-    $script:SearchHighlightColorDark = [System.Windows.Media.SolidColorBrush]::new([System.Windows.Media.ColorConverter]::ConvertFromString("#4A4A2A"))
-    
-    # Helper function to get the appropriate highlight brush based on theme
-    function GetSearchHighlightBrush {
-        if ($usesDarkMode) { return $script:SearchHighlightColorDark }
-        return $script:SearchHighlightColor
-    }
-    
     # Helper function to scroll to an item if it's not visible, centering it in the viewport
     function ScrollToItemIfNotVisible {
         param (
@@ -737,6 +756,10 @@ function Show-MainWindow {
     $appSearchBox = $window.FindName('AppSearchBox')
     $appSearchPlaceholder = $window.FindName('AppSearchPlaceholder')
     
+    # Track current search matches and active index for Enter-key navigation
+    $script:AppSearchMatches = @()
+    $script:AppSearchMatchIndex = -1
+    
     $appSearchBox.Add_TextChanged({
         $searchText = $appSearchBox.Text.ToLower().Trim()
         
@@ -750,29 +773,54 @@ function Show-MainWindow {
             }
         }
         
+        $script:AppSearchMatches = @()
+        $script:AppSearchMatchIndex = -1
+        
         if ([string]::IsNullOrWhiteSpace($searchText)) { return }
         
         # Find and highlight all matching apps
-        $firstMatch = $null
-        $highlightBrush = GetSearchHighlightBrush
+        $highlightBrush = $window.Resources["SearchHighlightColor"]
+        $activeHighlightBrush = $window.Resources["SearchHighlightActiveColor"]
         
         foreach ($child in $appsPanel.Children) {
             if ($child -is [System.Windows.Controls.CheckBox] -and $child.Visibility -eq 'Visible') {
-                if ($child.Content.ToString().ToLower().Contains($searchText)) {
+                $appName = if ($child.AppName) { $child.AppName } else { '' }
+                $appId = if ($child.Tag) { $child.Tag.ToString() } else { '' }
+                $appDesc = if ($child.AppDescription) { $child.AppDescription } else { '' }
+                if ($appName.ToLower().Contains($searchText) -or $appId.ToLower().Contains($searchText) -or $appDesc.ToLower().Contains($searchText)) {
                     $child.Background = $highlightBrush
-                    if ($null -eq $firstMatch) { $firstMatch = $child }
+                    $script:AppSearchMatches += $child
                 }
             }
         }
         
-        # Scroll to first match if not visible
-        if ($firstMatch) {
+        # Scroll to first match and mark it as active
+        if ($script:AppSearchMatches.Count -gt 0) {
+            $script:AppSearchMatchIndex = 0
+            $script:AppSearchMatches[0].Background = $activeHighlightBrush
             $scrollViewer = FindParentScrollViewer -element $appsPanel
             if ($scrollViewer) {
-                ScrollToItemIfNotVisible -scrollViewer $scrollViewer -item $firstMatch -container $appsPanel
+                ScrollToItemIfNotVisible -scrollViewer $scrollViewer -item $script:AppSearchMatches[0] -container $appsPanel
             }
         }
     })
+    
+    $appSearchBox.Add_KeyDown({
+        param($sender, $e)
+        if ($e.Key -eq [System.Windows.Input.Key]::Enter -and $script:AppSearchMatches.Count -gt 0) {
+            # Reset background of current active match
+            $script:AppSearchMatches[$script:AppSearchMatchIndex].Background = $window.Resources["SearchHighlightColor"]
+            # Advance to next match (wrapping)
+            $script:AppSearchMatchIndex = ($script:AppSearchMatchIndex + 1) % $script:AppSearchMatches.Count
+            # Highlight new active match
+            $script:AppSearchMatches[$script:AppSearchMatchIndex].Background = $window.Resources["SearchHighlightActiveColor"]
+            $scrollViewer = FindParentScrollViewer -element $appsPanel
+            if ($scrollViewer) {
+                ScrollToItemIfNotVisible -scrollViewer $scrollViewer -item $script:AppSearchMatches[$script:AppSearchMatchIndex] -container $appsPanel
+            }
+            $e.Handled = $true
+        }
+    })
 
     # Tweak Search Box functionality
     $tweakSearchBox = $window.FindName('TweakSearchBox')
@@ -835,7 +883,7 @@ function Show-MainWindow {
         
         # Find and highlight all matching tweaks
         $firstMatch = $null
-        $highlightBrush = GetSearchHighlightBrush
+        $highlightBrush = $window.Resources["SearchHighlightColor"]
         $columns = @($col0, $col1, $col2) | Where-Object { $_ -ne $null }
         
         foreach ($column in $columns) {