From 255d5a03221cf5a2ba7650563fcf5eecc7933cdb Mon Sep 17 00:00:00 2001
From: Zach Teutsch <88554871+zateutsch@users.noreply.github.com>
Date: Mon, 15 Dec 2025 23:24:58 -0500
Subject: [PATCH] Fix program inout control xaml

---
 .../Controls/AppPageInputControl.xaml         | 143 +++++++++---------
 .../Pages/Programs.xaml                       |   3 +
 .../Strings/en-US/Resources.resw              |  15 +-
 3 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
index 4753f2d589..ca6350789b 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Controls/AppPageInputControl.xaml
@@ -13,7 +13,7 @@
 
     <StackPanel
         Width="360"
-        Height="360"
+        Height="600"
         Orientation="Vertical"
         Spacing="8">
         <!-- Shortcut section -->
@@ -48,75 +48,78 @@
             </ToggleButton.Content>
         </ToggleButton>
 
-        <TextBlock 
-            x:Uid="AppPageInputControlExampleTextBlock"
-            VerticalAlignment="Center" />
-        <TextBox 
-            x:Name="ProgramPathInput" 
-            Width="180" />
-        <Button 
-            x:Name="ProgramPathSelectButton"
-            x:Uid="AppPageInputControlPathSelectButton"
-            Click="ProgramPathSelectButton_Click" />
+        <StackPanel
+            Orientation="Horizontal"
+            Spacing="4"
+            Margin="0,8,0,0">
+            <TextBox 
+                x:Uid="AppPageInputControlExampleTextBox"
+                x:Name="ProgramPathInput" 
+                Width="220" />
+            <Button 
+                x:Name="ProgramPathSelectButton"
+                x:Uid="AppPageInputControlPathSelectButton"
+                Click="ProgramPathSelectButton_Click"
+                VerticalAlignment="Bottom"
+                Width="120"/>
+        </StackPanel>
 
-        <Expander>
-            <Expander.Content>
-                <ScrollView>
-                    <StackPanel
-                        Orientation="Vertical"
-                        Spacing="8"
-                        Margin="0,8,0,0">
-                        <TextBlock 
-                            x:Uid="AppPageInputControlArgumentsTextBlock"
-                            VerticalAlignment="Center" />
-                        <TextBox 
-                            x:Name="ProgramArgsInput" 
-                            Width="180" />
-                        <TextBlock 
-                            x:Uid="AppPageInputControlStartInTextBlock"
-                            VerticalAlignment="Center" />
-                        <TextBox 
-                            x:Name="StartInPathInput"
-                            Width="180" />
-                        <Button 
-                            x:Name="StartInSelectButton"
-                            x:Uid="AppPageInputControlStartInSelectButton"
-                            Click="StartInSelectButton_Click" />
-
-                        <ComboBox 
-                            x:Name="ElevationComboBox"
-                            x:Uid="AppPageInputControlElevationComboBox"
-                            SelectedValue="Normal" 
-                            Width="110">
-                            <x:String>Normal</x:String>
-                            <x:String>Elevated</x:String>
-                            <x:String>Different user</x:String>
-                        </ComboBox>
-                        <ComboBox
-                            x:Name="IfRunningComboBox"
-                            x:Uid="AppPageInputControlIfRunningComboBox"
-                            SelectedValue="Show window" 
-                            Width="110">
-                            <x:String>Show window</x:String>
-                            <x:String>Start another</x:String>
-                            <x:String>Do nothing</x:String>
-                            <x:String>Close</x:String>
-                            <x:String>End task</x:String>
-                        </ComboBox>
-                        <ComboBox 
-                            x:Name="VisibilityComboBox"
-                            x:Uid="AppPageInputControlVisibilityComboBox"
-                            SelectedValue="Normal" 
-                            Width="110">
-                            <x:String>Normal</x:String>
-                            <x:String>Hidden</x:String>
-                            <x:String>Minimized</x:String>
-                            <x:String>Maximized</x:String>
-                        </ComboBox>
-                    </StackPanel>
-                </ScrollView>
-            </Expander.Content>
-        </Expander>
-            
+        <TextBlock
+            x:Uid="AppPageInputControlExtraOptionsTextBlock"
+            Margin="0,12,0,8"
+            FontWeight="SemiBold" />
+        <StackPanel
+                Orientation="Vertical"
+                Spacing="8"
+                Margin="0,8,0,0">
+            <TextBox 
+                x:Uid="AppPageInputControlArgumentsTextBox"
+                x:Name="ProgramArgsInput" 
+                Width="360" />
+            <StackPanel 
+                Orientation="Horizontal"
+                Spacing="4">
+                <TextBox 
+                    x:Uid="AppPageInputControlStartInTextBox"
+                    x:Name="StartInPathInput"
+                    Width="220" />
+                <Button 
+                    x:Name="StartInSelectButton"
+                    x:Uid="AppPageInputControlStartInSelectButton"
+                    VerticalAlignment="Bottom"
+                    Click="StartInSelectButton_Click"
+                    Width="120"/>
+            </StackPanel>
+            <ComboBox 
+                x:Name="ElevationComboBox"
+                x:Uid="AppPageInputControlElevationComboBox"
+                SelectedValue="Normal" 
+                Width="360">
+                <x:String>Normal</x:String>
+                <x:String>Elevated</x:String>
+                <x:String>Different user</x:String>
+            </ComboBox>
+            <ComboBox
+                x:Name="IfRunningComboBox"
+                x:Uid="AppPageInputControlIfRunningComboBox"
+                SelectedValue="Show window" 
+                Width="360">
+                <x:String>Show window</x:String>
+                <x:String>Start another</x:String>
+                <x:String>Do nothing</x:String>
+                <x:String>Close</x:String>
+                <x:String>End task</x:String>
+            </ComboBox>
+            <ComboBox 
+                x:Name="VisibilityComboBox"
+                x:Uid="AppPageInputControlVisibilityComboBox"
+                SelectedValue="Normal" 
+                Width="360">
+                <x:String>Normal</x:String>
+                <x:String>Hidden</x:String>
+                <x:String>Minimized</x:String>
+                <x:String>Maximized</x:String>
+            </ComboBox>
+        </StackPanel>
     </StackPanel>
 </UserControl>
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
index 9b35332e51..4ae2b0b1f3 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
@@ -163,6 +163,9 @@
             Width="480"
             MinWidth="600"
             MaxWidth="600"
+            MinHeight="600"
+            MaxHeight="600"
+            Height="600"
             PrimaryButtonClick="KeyDialog_PrimaryButtonClick"
             PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
             <Grid>
diff --git a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
index a3e100ef1a..dff6b8799b 100644
--- a/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
+++ b/src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
@@ -189,8 +189,8 @@
   <data name="ProgramsPageKeyDialog.Title" xml:space="preserve">
     <value>New program shortcut</value>
   </data>
-  <data name="AppPageInputControlExampleTextBlock.Text" xml:space="preserve">
-    <value>Application</value>
+  <data name="AppPageInputControlExampleTextBox.Header" xml:space="preserve">
+    <value>Program</value>
   </data>
   <data name="ProgramsPageNewTextBlock.Text" xml:space="preserve">
     <value>New</value>
@@ -276,14 +276,14 @@
   <data name="AppPageInputControlPathSelectButton.Content" xml:space="preserve">
     <value>Select Program</value>
   </data>
-  <data name="AppPageInputControlArgumentsTextBlock.Text" xml:space="preserve">
+  <data name="AppPageInputControlArgumentsTextBox.Header" xml:space="preserve">
     <value>Arguments</value>
   </data>
-  <data name="AppPageInputControlStartInTextBlock.Text" xml:space="preserve">
+  <data name="AppPageInputControlStartInTextBox.Header" xml:space="preserve">
     <value>Start in</value>
   </data>
-  <data name="AppPageInputControlStartInSelectButto" xml:space="preserve">
-    <value>Select starting directory</value>
+  <data name="AppPageInputControlStartInSelectButton.Content" xml:space="preserve">
+    <value>Select directory</value>
   </data>
   <data name="AppPageInputControlElevationComboBox.Header" xml:space="preserve">
     <value>Elevation</value>
@@ -306,4 +306,7 @@
   <data name="UrlPageInputControlToOpenTextBox.PlaceholderText" xml:space="preserve">
     <value>https://github.com/microsoft/PowerToys</value>
   </data>
+  <data name="AppPageInputControlExtraOptionsTextBlock.Text" xml:space="preserve">
+    <value>More options</value>
+  </data>
 </root>
\ No newline at end of file