Merge c88bf796f4 into a652fd879b

v2rayN/v2rayN.Desktop/Views/MsgView.axaml.cs

@@ -46,6 +46,8 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
 
     private void ShowMsg(object msg)
     {
+        txtMsg.BeginChange();
+
         //var lineCount = txtMsg.LineCount;
         //if (lineCount > ViewModel?.NumMaxMsg)
         //{
@@ -62,11 +64,13 @@ public partial class MsgView : ReactiveUserControl<MsgViewModel>
         {
             txtMsg.ScrollToEnd();
         }
+
+        txtMsg.EndChange();
     }
 
     public void ClearMsg()
     {
-        txtMsg.Clear();
+        txtMsg.Text = string.Empty;
         txtMsg.AppendText("----- Message cleared -----\n");
     }
 

v2rayN/v2rayN.Desktop/Views/QrcodeView.axaml

@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <UserControl.Resources>
-        <sys:Double x:Key="QrcodeWidth">400</sys:Double>
+        <sys:Double x:Key="QrcodeWidth">500</sys:Double>
     </UserControl.Resources>
 
     <Grid Margin="32" RowDefinitions="Auto,Auto">

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -47,6 +47,8 @@ public partial class MsgView
 
     private void ShowMsg(object msg)
     {
+        txtMsg.BeginChange();
+
         if (txtMsg.LineCount > ViewModel?.NumMaxMsg)
         {
             ClearMsg();
@@ -57,6 +59,8 @@ public partial class MsgView
         {
             txtMsg.ScrollToEnd();
         }
+
+        txtMsg.EndChange();
     }
 
     public void ClearMsg()

v2rayN/v2rayN/Views/QrcodeView.xaml

@@ -12,7 +12,7 @@
     Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <UserControl.Resources>
-        <sys:Double x:Key="QrcodeWidth">400</sys:Double>
+        <sys:Double x:Key="QrcodeWidth">500</sys:Double>
     </UserControl.Resources>
 
     <Grid Margin="32">