Merge fe14f0a94c into 68713e7b77

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

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

v2rayN/v2rayN/Views/QrcodeView.xaml

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