Skip to content

Add Finalmask support #8820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2dust merged 2 commits into from
Feb 24, 2026
Merged

Add Finalmask support #8820

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52f3829
Add Finalmask support
DHR60 Feb 18, 2026
4a836f9
UI
DHR60 Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
UI
  • Loading branch information
@DHR60
DHR60 committed Feb 24, 2026
commit 4a836f95831c54d01817eeceeb4f2a6876fdfc6c
71 changes: 45 additions & 26 deletions v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,11 +722,51 @@
Text="{x:Static resx:ResUI.TbPath}" />
</Grid>

<Separator Grid.Row="5" Margin="{StaticResource MarginTb8}" />
<Grid
x:Name="gridFinalmask"
Grid.Row="5"
ColumnDefinitions="300,Auto">
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbFinalmask}" />
<Button
Grid.Row="0"
Grid.Column="1"
Margin="{StaticResource MarginLr4}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Classes="IconButton">
<Button.Content>
<PathIcon Data="{StaticResource SemiIconMore}">
<PathIcon.RenderTransform>
<RotateTransform Angle="90" />
</PathIcon.RenderTransform>
</PathIcon>
</Button.Content>
<Button.Flyout>
<Flyout>
<StackPanel>
<TextBox
x:Name="txtFinalmask"
Width="400"
Margin="{StaticResource Margin4}"
AcceptsReturn="True"
Classes="TextArea"
TextWrapping="NoWrap" />
</StackPanel>
</Flyout>
</Button.Flyout>
</Button>
</Grid>

<Separator Grid.Row="6" Margin="{StaticResource MarginTb8}" />

<Grid
x:Name="gridTls"
Grid.Row="6"
Grid.Row="7"
ColumnDefinitions="300,Auto"
RowDefinitions="Auto,Auto,Auto,Auto,Auto">

Expand All @@ -745,7 +785,7 @@
</Grid>
<Grid
x:Name="gridTlsMore"
Grid.Row="7"
Grid.Row="8"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
Expand Down Expand Up @@ -908,7 +948,7 @@
</Grid>
<Grid
x:Name="gridRealityMore"
Grid.Row="7"
Grid.Row="8"
ColumnDefinitions="300,Auto"
IsVisible="False"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
Expand Down Expand Up @@ -996,28 +1036,7 @@
Margin="{StaticResource Margin4}"
HorizontalAlignment="Left" />
</Grid>
<Separator Grid.Row="8" Margin="{StaticResource MarginTb8}" />
<Grid
x:Name="gridFinalmask"
Grid.Row="9"
ColumnDefinitions="300,Auto">
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Text="{x:Static resx:ResUI.TbFinalmask}" />
<TextBox
x:Name="txtFinalmask"
Grid.Row="0"
Grid.Column="1"
Width="400"
Margin="{StaticResource Margin4}"
AcceptsReturn="True"
Classes="TextArea"
TextWrapping="NoWrap" />
</Grid>
<Separator Grid.Row="10" Margin="{StaticResource MarginTb8}" />
<Separator Grid.Row="9" Margin="{StaticResource MarginTb8}" />
</Grid>
</ScrollViewer>
</DockPanel>
Expand Down
75 changes: 40 additions & 35 deletions v2rayN/v2rayN/Views/AddServerWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,12 +930,47 @@
Text="{x:Static resx:ResUI.TbPath}" />
</Grid>

<Grid x:Name="gridFinalmask" Grid.Row="5">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbFinalmask}" />
<materialDesign:PopupBox
Grid.Row="0"
Grid.Column="1"
HorizontalAlignment="Left"
VerticalAlignment="Center"
StaysOpen="True"
Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
<StackPanel>
<TextBox
x:Name="txtFinalmask"
Width="400"
Margin="{StaticResource Margin4}"
AcceptsReturn="True"
HorizontalScrollBarVisibility="Auto"
MaxLines="8"
MinLines="4"
Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="NoWrap"
VerticalScrollBarVisibility="Auto" />
</StackPanel>
</materialDesign:PopupBox>
</Grid>

<Separator
Grid.Row="5"
Grid.Row="6"
Margin="0,2"
Style="{DynamicResource MaterialDesignSeparator}" />

<Grid x:Name="gridTls" Grid.Row="6">
<Grid x:Name="gridTls" Grid.Row="7">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
Expand Down Expand Up @@ -965,7 +1000,7 @@
</Grid>
<Grid
x:Name="gridTlsMore"
Grid.Row="7"
Grid.Row="8"
Visibility="Hidden">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
Expand Down Expand Up @@ -1154,7 +1189,7 @@
</Grid>
<Grid
x:Name="gridRealityMore"
Grid.Row="7"
Grid.Row="8"
Visibility="Hidden">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
Expand Down Expand Up @@ -1266,37 +1301,7 @@
Style="{StaticResource DefTextBox}" />
</Grid>
<Separator
Grid.Row="8"
Margin="0,2"
Style="{DynamicResource MaterialDesignSeparator}" />
<Grid x:Name="gridFinalmask" Grid.Row="9">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock
Grid.Row="0"
Grid.Column="0"
Margin="{StaticResource Margin4}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbFinalmask}" />
<TextBox
x:Name="txtFinalmask"
Grid.Row="0"
Grid.Column="1"
Width="400"
Margin="{StaticResource Margin4}"
AcceptsReturn="True"
HorizontalScrollBarVisibility="Auto"
MaxLines="8"
MinLines="4"
Style="{StaticResource MyOutlinedTextBox}"
TextWrapping="NoWrap"
VerticalScrollBarVisibility="Auto" />
</Grid>
<Separator
Grid.Row="10"
Grid.Row="9"
Margin="0,2"
Style="{DynamicResource MaterialDesignSeparator}" />
</Grid>
Expand Down