Window Control Focus Changes

- set the default focus control for all the windows.
This commit is contained in:
Brett Hewitson 2022-06-21 11:23:10 +10:00
parent 4199ab6160
commit 0b5d7c933a
41 changed files with 115 additions and 73 deletions

View file

@ -8,6 +8,7 @@
xmlns:globcntrls="clr-namespace:WPFSharp.Globalizer.Controls;assembly=WPFSharp.Globalizer"
mc:Ignorable="d"
d:DesignWidth="800"
FocusManager.FocusedElement="{Binding ElementName=DataPathTextBox}"
x:Name="GlobalSettings">
<UserControl.Resources>
<ResourceDictionary>
@ -76,7 +77,7 @@
<ComboBox Name="WindowStateServerMonitorComboBox" Grid.Row="4" Grid.Column="1" Margin="1,2,1,2" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStatesServerMonitor}" SelectedValue="{Binding Config.ServerMonitorWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
<Label Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
<TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataDir, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
<TextBox x:Name="DataPathTextBox" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataDir, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
<Button Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden" />
<Button Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />

View file

@ -15,6 +15,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d"
d:DesignWidth="900"
FocusManager.FocusedElement="{Binding ElementName=ProfileNameTextBox}"
x:Name="SettingsControl">
<UserControl.Resources>
<ResourceDictionary>
@ -223,7 +224,7 @@
<DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
<Label DockPanel.Dock="Left" FontSize="15" Content="{DynamicResource ServerSettings_ProfileLabel}" ToolTip="{Binding ProfileToolTip}"/>
<TextBox VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
<TextBox x:Name="ProfileNameTextBox" VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
<Validation.ErrorTemplate>
<ControlTemplate>
<StackPanel>