misc UI improvements

Valkirie · Jun 24, 2023 · 27f4b72 · 27f4b72
1 parent b2cf4d3
commit 27f4b72
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/HandheldCompanion/Managers/GamepadFocusManager.cs b/HandheldCompanion/Managers/GamepadFocusManager.cs
@@ -403,6 +403,18 @@ private void InputsUpdated(ControllerState controllerState)
                             }
                             break;
 
+                        case "ComboBox":
+                            {
+                                ComboBox comboBox = (ComboBox)focusedElement;
+                                switch(comboBox.IsDropDownOpen)
+                                {
+                                    case true:
+                                        comboBox.IsDropDownOpen = false;
+                                        break;
+                                }
+                            }
+                            return;
+
                         case "ComboBoxItem":
                             {
                                 ComboBox comboBox = ItemsControl.ItemsControlFromItemContainer(focusedElement) as ComboBox;

diff --git a/HandheldCompanion/Views/Pages/LayoutPage.xaml b/HandheldCompanion/Views/Pages/LayoutPage.xaml
@@ -94,7 +94,7 @@
                     d:Visibility="Visible"
                     Spacing="12">
 
-                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="Layout picker" />
+                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="Layout template picker" />
                     <ComboBox
                         Name="cB_Layouts"
                         HorizontalAlignment="Stretch"
@@ -115,21 +115,21 @@
                             Checked="CheckBoxDeviceLayouts_Checked"
                             IsChecked="True"
                             Unchecked="CheckBoxDeviceLayouts_Checked">
-                            Show current controller layouts only
+                            Show current controller templates only
                         </CheckBox>
 
                         <ui:SimpleStackPanel
                             HorizontalAlignment="Right"
                             Orientation="Horizontal"
                             Spacing="6">
 
-                            <!-- Apply layout -->
+                            <!--  Apply template  -->
                             <Button
                                 Name="ButtonApplyLayout"
                                 Click="ButtonApplyLayout_Click"
                                 IsEnabled="False"
                                 Style="{DynamicResource AccentButtonStyle}">
-                                Apply layout
+                                Apply template
                             </Button>
 
                             <!--  Export layout  -->
@@ -156,11 +156,12 @@
                                                     Name="LayoutAuthor"
                                                     HorizontalAlignment="Stretch"
                                                     ui:ControlHelper.Header="Layout author" />
-                                                <CheckBox x:Name="ExportForCurrent"
-                                                          Content="Export for current controller" />
-                                                <CheckBox x:Name="SaveGameInfo"
-                                                          Content="Save game information with the layout"
-                                                          IsChecked="True" Click="SaveGameInfo_Toggled" />
+                                                <CheckBox x:Name="ExportForCurrent" Content="Export for current controller" />
+                                                <CheckBox
+                                                    x:Name="SaveGameInfo"
+                                                    Click="SaveGameInfo_Toggled"
+                                                    Content="Save game information with the layout"
+                                                    IsChecked="True" />
 
                                                 <!--  Separator  -->
                                                 <Separator

diff --git a/Resources/Inkore.UI.WPF.Modern.dll b/Resources/Inkore.UI.WPF.Modern.dll