Commit d7ce010

committed

enhance: add Views.StealHotKey.Enter to use hotkey Enter to start popup directly without checking focused TextBox (#1606)

Signed-off-by: leo <longshuang@msn.cn>

1 parent 70be81f commit d7ce010Copy full SHA for d7ce010

File tree

+22

-5

lines changed

+22

-5

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@`
`27`	`27`	`ScrollViewer.VerticalScrollBarVisibility="Disabled"`
`28`	`28`	`Text="{Binding #ThisControl.Subject, Mode=TwoWay}"`
`29`	`29`	`Watermark="{DynamicResource Text.CommitMessageTextBox.SubjectPlaceholder}"`
`30`		`- PreviewKeyDown="OnSubjectTextBoxPreviewKeyDown"/>`
	`30`	`+ PreviewKeyDown="OnSubjectTextBoxPreviewKeyDown"`
	`31`	`+ Tag="{Binding Source={x:Static v:StealHotKey.Enter}}"/>`
`31`	`32`
`32`	`33`	`<Rectangle Grid.Row="1"`
`33`	`34`	`Height="1"`
`@@ -51,7 +52,8 @@`
`51`	`52`	`ScrollViewer.VerticalScrollBarVisibility="Auto"`
`52`	`53`	`Text="{Binding #ThisControl.Description, Mode=TwoWay}"`
`53`	`54`	`Watermark="{DynamicResource Text.CommitMessageTextBox.MessagePlaceholder}"`
`54`		`- PreviewKeyDown="OnDescriptionTextBoxPreviewKeyDown"/>`
	`55`	`+ PreviewKeyDown="OnDescriptionTextBoxPreviewKeyDown"`
	`56`	`+ Tag="{Binding Source={x:Static v:StealHotKey.Enter}}"/>`
`55`	`57`
`56`	`58`	`<Rectangle Grid.Row="3"`
`57`	`59`	`Height="1"`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@`
`74`	`74`	`CornerRadius="2"`
`75`	`75`	`Watermark="{DynamicResource Text.CreateTag.Message.Placeholder}"`
`76`	`76`	`Text="{Binding Message, Mode=TwoWay}"`
`77`		`- IsVisible="{Binding Annotated}"/>`
	`77`	`+ IsVisible="{Binding Annotated}"`
	`78`	`+ Tag="{Binding Source={x:Static v:StealHotKey.Enter}}"/>`
`78`	`79`
`79`	`80`	`<CheckBox Grid.Row="4" Grid.Column="1"`
`80`	`81`	`Height="32" Margin="0,4,0,0"`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ private void OnPopupSureByHotKey(object sender, RoutedEventArgs e)`
`20`	`20`	`var children = this.GetLogicalDescendants();`
`21`	`21`	`foreach (var child in children)`
`22`	`22`	`{`
`23`		`- if (child is TextBox { IsFocused: true } textBox)`
	`23`	`+ if (child is TextBox { IsFocused: true, Tag: StealHotKey steal } textBox &&`
	`24`	`+ steal is { Key: Key.Enter, KeyModifiers: KeyModifiers.None })`
`24`	`25`	`{`
`25`	`26`	`var fake = new KeyEventArgs()`
`26`	`27`	`{`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@`
`47`	`47`	`AcceptsTab="True"`
`48`	`48`	`VerticalContentAlignment="Top"`
`49`	`49`	`Padding="4"`
`50`		`- v:AutoFocusBehaviour.IsEnabled="True"/>`
	`50`	`+ v:AutoFocusBehaviour.IsEnabled="True"`
	`51`	`+ Tag="{Binding Source={x:Static v:StealHotKey.Enter}}"/>`
`51`	`52`
`52`	`53`	`<CheckBox Grid.Row="2" Grid.Column="1"`
`53`	`54`	`Height="32"`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,12 @@`
	`1`	`+using Avalonia.Input;`
	`2`	`+`
	`3`	`+namespace SourceGit.Views`
	`4`	`+{`
	`5`	`+ public class StealHotKey(Key key, KeyModifiers keyModifiers = KeyModifiers.None)`
	`6`	`+ {`
	`7`	`+ public Key Key { get; } = key;`
	`8`	`+ public KeyModifiers KeyModifiers { get; } = keyModifiers;`
	`9`	`+`
	`10`	`+ public static StealHotKey Enter { get; } = new StealHotKey(Key.Enter);`
	`11`	`+ }`
	`12`	`+}`

Comments

(0)