[skip ci] WIP: Control focus enhancements

TheXDS · Jan 3, 2024 · ed6d852 · ed6d852
1 parent 74e4ea4
commit ed6d852
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 17 deletions.
diff --git a/src/Platform/Ganymede.Wpf/Controls/Int32TextBox.cs b/src/Platform/Ganymede.Wpf/Controls/Int32TextBox.cs
@@ -1,4 +1,5 @@
-using TheXDS.Ganymede.Controls.Primitives;
+using System.Windows.Controls.Primitives;
+using TheXDS.Ganymede.Controls.Primitives;
 using static TheXDS.Ganymede.Helpers.DependencyObjectHelpers;
 
 namespace TheXDS.Ganymede.Controls;

diff --git a/src/Platform/Ganymede.Wpf/Controls/Primitives/NumericInputControl.cs b/src/Platform/Ganymede.Wpf/Controls/Primitives/NumericInputControl.cs
@@ -137,7 +137,7 @@ private static void OnValueChanged(DependencyObject d, DependencyPropertyChanged
         }
     }
 
-    private TextBoxEx? _tb;
+    private TextBox? _tb;
 
     /// <summary>
     /// Gets or sets the maximum allowed value on this control.
@@ -180,11 +180,12 @@ public T Value
     public override void OnApplyTemplate()
     {
         base.OnApplyTemplate();
-        _tb = Template.FindName("PART_input", this) as TextBoxEx;
+        _tb = Template.FindName("PART_input", this) as TextBox;
         if (_tb is not null) 
         {
             _tb.Text = Value.ToString();
             _tb.TextChanged += Tb_TextChanged;
+            _tb.GotKeyboardFocus += (_, _) => _tb.SelectAll();
         }
         WireUp("increase", _Settings.Add);
         WireUp("decrease", _Settings.Subtract);
@@ -209,6 +210,7 @@ private void Tb_TextChanged(object sender, TextChangedEventArgs e)
             else
             {
                 _tb.Text = Value.ToString();
+                _tb.SelectAll();
             }
         }
     }

diff --git a/src/Platform/Ganymede.Wpf/Resources/ControlTemplates/IntegerTextBox/Default.xaml b/src/Platform/Ganymede.Wpf/Resources/ControlTemplates/IntegerTextBox/Default.xaml
@@ -15,7 +15,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -34,7 +34,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -53,14 +53,14 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<Style TargetType="{x:Type controls:UInt16TextBox}">
-		<Setter Property="Template">
+        <Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:UInt16TextBox}">
 					<DockPanel>
@@ -72,13 +72,14 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 	<Style TargetType="{x:Type controls:Int32TextBox}">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:Int32TextBox}">
@@ -91,7 +92,7 @@
                                 <Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
                             </RepeatButton>
                         </UniformGrid>
-                        <controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx IsTabStop="True" Focusable="True" TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
                     </DockPanel>
                 </ControlTemplate>
             </Setter.Value>
@@ -110,7 +111,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -129,7 +130,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -148,7 +149,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -167,7 +168,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -186,7 +187,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -205,7 +206,7 @@
 								<Path Fill="Black" Data="M 0 0 L 3 3 L 6 0 Z"/>
 							</RepeatButton>
 						</UniformGrid>
-						<controls:TextBoxEx Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
+                        <controls:TextBoxEx TabIndex="1" Icon="{TemplateBinding Icon}" Label="{TemplateBinding Label}" x:Name="PART_input"/>
 					</DockPanel>
 				</ControlTemplate>
 			</Setter.Value>

diff --git a/src/Platform/Ganymede.Wpf/Resources/ControlTemplates/NavigationViewModelHost/Default.xaml b/src/Platform/Ganymede.Wpf/Resources/ControlTemplates/NavigationViewModelHost/Default.xaml
@@ -7,6 +7,7 @@
     <vc:BooleanInverter x:Key="binv"/>
     <vc:NullToBooleanConverter x:Key="n2vc"/>
     <Style TargetType="c:NavigationViewModelHost">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="c:NavigationViewModelHost">

diff --git a/src/Platform/Ganymede.Wpf/Resources/DialogTemplates/CredentialDialogTemplateBuilder.cs b/src/Platform/Ganymede.Wpf/Resources/DialogTemplates/CredentialDialogTemplateBuilder.cs
@@ -25,7 +25,6 @@ public class CredentialDialogTemplateBuilder : IDialogTemplateBuilder<Credential
             viewModel.Password = pwd.SecurePassword;
         };
         usr.SetBinding(TextBox.TextProperty, new Binding(nameof(viewModel.User)));
-
         return new StackPanel() {  Children = { usr, pwd } };
     }
 }
diff --git a/src/Platform/Ganymede.Wpf/ValueConverters/DialogVisualConverter.cs b/src/Platform/Ganymede.Wpf/ValueConverters/DialogVisualConverter.cs
@@ -3,6 +3,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows;
+using System.Windows.Input;
 using TheXDS.Ganymede.Controls;
 using TheXDS.Ganymede.Controls.Primitives;
 using TheXDS.Ganymede.Resources.DialogTemplates;
@@ -48,7 +49,20 @@ static DialogVisualConverter()
     public FrameworkElement? Convert(DialogViewModel value, object? parameter, CultureInfo? culture)
     {
         var builder = Builders.FirstOrDefault(p => p.CanBuild(value));
-        return builder?.Build(value)!;
+        var result = builder?.Build(value);
+        if (result is not null)
+        {
+            result.Loaded += DialogContent_Loaded;
+        }
+        return result;
+    }
+
+    private void DialogContent_Loaded(object sender, RoutedEventArgs e)
+    {
+        FrameworkElement control = (FrameworkElement)sender;
+        control.Focus();
+        Keyboard.Focus(control);
+        control.Loaded -= DialogContent_Loaded;
     }
 
     /// <summary>

diff --git a/src/Platform/Ganymede.Wpf/Views/Dialogs/DialogView.xaml b/src/Platform/Ganymede.Wpf/Views/Dialogs/DialogView.xaml
@@ -75,6 +75,7 @@
                 </StackPanel>
             </ScrollViewer>
             <ItemsControl
+                IsTabStop="False"
                 HorizontalAlignment="Center"
                 Margin="5"
                 Grid.Row="2"
@@ -95,6 +96,7 @@
                             SnapsToDevicePixels="True"
                             Padding="10,5"
                             Margin="5"
+                            IsDefault="{Binding IsPrimary, Mode=OneWay}"
                             Content="{Binding Text, Mode=OneWay}"
                             Command="{Binding Command, Mode=OneWay}"/>
                     </DataTemplate>