Skip to content

Commit a87a015

Browse files
authored
Fix some minor UI bugs (#7941)
1 parent c559914 commit a87a015

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
Grid.Column="1"
401401
Width="400"
402402
Margin="{StaticResource Margin4}"
403-
Watermark="1000:2000,3000:4000" />
403+
Watermark="1000-2000,3000,4000" />
404404
<TextBlock
405405
Grid.Row="3"
406406
Grid.Column="2"

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
<DataGrid
177177
x:Name="lstRules"
178178
AutoGenerateColumns="False"
179+
Background="Transparent"
179180
BorderThickness="1"
180181
CanUserResizeColumns="True"
181182
GridLinesVisibility="All"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<DataGrid
9393
x:Name="lstRoutings"
9494
AutoGenerateColumns="False"
95+
Background="Transparent"
9596
BorderThickness="1"
9697
CanUserResizeColumns="True"
9798
GridLinesVisibility="All"

v2rayN/v2rayN/Views/AddServerWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
Width="400"
539539
Margin="{StaticResource Margin4}"
540540
HorizontalAlignment="Left"
541-
materialDesign:HintAssist.Hint="1000:2000,3000:4000"
541+
materialDesign:HintAssist.Hint="1000-2000,3000,4000"
542542
Style="{StaticResource DefTextBox}" />
543543
<TextBlock
544544
Grid.Row="3"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
122122

123123
private void RoutingRuleSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
124124
{
125+
if (!lstRules.IsKeyboardFocusWithin)
126+
return;
125127
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
126128
{
127129
if (e.Key == Key.A)

0 commit comments

Comments
 (0)