Fix
Some checks failed
release Linux / build (Release) (push) Has been cancelled
release macOS / build (Release) (push) Has been cancelled
release Windows desktop (Avalonia UI) / build (Release) (push) Has been cancelled
release Windows / build (Release) (push) Has been cancelled

https://github.com/2dust/v2rayN/issues/8129
This commit is contained in:
2dust 2025-10-16 12:18:14 +08:00
parent 68713e7b77
commit 0c0ecc359b
2 changed files with 35 additions and 34 deletions

View file

@ -13,7 +13,7 @@
<sys:Double x:Key="QrcodeWidth">400</sys:Double> <sys:Double x:Key="QrcodeWidth">400</sys:Double>
</UserControl.Resources> </UserControl.Resources>
<Grid Margin="32" RowDefinitions="Auto,Auto"> <Grid Margin="{StaticResource Margin8}" RowDefinitions="Auto,Auto">
<Image <Image
Name="imgQrcode" Name="imgQrcode"
Width="{StaticResource QrcodeWidth}" Width="{StaticResource QrcodeWidth}"

View file

@ -15,40 +15,41 @@
<sys:Double x:Key="QrcodeWidth">400</sys:Double> <sys:Double x:Key="QrcodeWidth">400</sys:Double>
</UserControl.Resources> </UserControl.Resources>
<Grid Margin="32"> <DockPanel Margin="{StaticResource Margin8}">
<Grid.RowDefinitions> <StackPanel Margin="{StaticResource Margin8}" DockPanel.Dock="Bottom">
<RowDefinition Height="Auto" /> <Button
<RowDefinition Height="Auto" /> Width="100"
<RowDefinition Height="80" /> HorizontalAlignment="Right"
</Grid.RowDefinitions> Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
Content="{x:Static resx:ResUI.menuClose}"
IsCancel="True"
IsDefault="True"
Style="{StaticResource DefButton}" />
</StackPanel>
<Image <Grid Margin="{StaticResource Margin8}">
x:Name="imgQrcode" <Grid.RowDefinitions>
Grid.Row="0" <RowDefinition Height="Auto" />
Width="{StaticResource QrcodeWidth}" <RowDefinition Height="Auto" />
Height="{StaticResource QrcodeWidth}" </Grid.RowDefinitions>
Stretch="UniformToFill" />
<TextBox <Image
x:Name="txtContent" x:Name="imgQrcode"
Grid.Row="1" Grid.Row="0"
Width="{StaticResource QrcodeWidth}" Width="{StaticResource QrcodeWidth}"
Margin="0,8" Height="{StaticResource QrcodeWidth}"
VerticalAlignment="Center" Stretch="UniformToFill" />
IsReadOnly="True"
MaxLines="3"
TextWrapping="Wrap"
VerticalScrollBarVisibility="Auto" />
<Button <TextBox
Grid.Row="2" x:Name="txtContent"
Width="100" Grid.Row="1"
Margin="{StaticResource Margin8}" Width="{StaticResource QrcodeWidth}"
HorizontalAlignment="Right" Margin="0,8"
Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" VerticalAlignment="Center"
Content="{x:Static resx:ResUI.menuClose}" IsReadOnly="True"
IsCancel="True" MaxLines="3"
IsDefault="True" TextWrapping="Wrap"
Style="{StaticResource DefButton}" /> VerticalScrollBarVisibility="Auto" />
</Grid> </Grid>
</DockPanel>
</UserControl> </UserControl>