Compare commits

..

3 commits

Author SHA1 Message Date
DHR60
8543454c1d
Merge c88bf796f4 into dc4611a258 2025-09-27 00:24:05 +08:00
2dust
dc4611a258 Adjust qrcode width
Some checks are pending
release Linux / build (Release) (push) Waiting to run
release macOS / build (Release) (push) Waiting to run
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
release Windows / build (Release) (push) Waiting to run
2025-09-26 20:36:27 +08:00
2dust
03d5b7a05b Bug fix
Some checks are pending
release Linux / build (Release) (push) Waiting to run
release macOS / build (Release) (push) Waiting to run
release Windows desktop (Avalonia UI) / build (Release) (push) Waiting to run
release Windows / build (Release) (push) Waiting to run
2025-09-26 17:11:48 +08:00
4 changed files with 3 additions and 11 deletions

View file

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

View file

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

View file

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

View file

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