diff --git a/qtc-net-client-2/Forms/Chat.Designer.cs b/qtc-net-client-2/Forms/Chat.Designer.cs index ab93a0e..eefb77d 100644 --- a/qtc-net-client-2/Forms/Chat.Designer.cs +++ b/qtc-net-client-2/Forms/Chat.Designer.cs @@ -57,13 +57,13 @@ // // rtxtChat // + rtxtChat.HideSelection = false; rtxtChat.Location = new Point(12, 12); rtxtChat.Name = "rtxtChat"; rtxtChat.ReadOnly = true; rtxtChat.Size = new Size(593, 250); rtxtChat.TabIndex = 3; rtxtChat.Text = ""; - rtxtChat.TextChanged += rtxtChat_TextChanged; // // Chat // diff --git a/qtc-net-client-2/Forms/Chat.cs b/qtc-net-client-2/Forms/Chat.cs index c9a3b12..85fad7c 100644 --- a/qtc-net-client-2/Forms/Chat.cs +++ b/qtc-net-client-2/Forms/Chat.cs @@ -68,12 +68,6 @@ namespace qtc_net_client_2.Forms btnSend_Click(sender, e); } - private void rtxtChat_TextChanged(object sender, EventArgs e) - { - rtxtChat.SelectionStart = rtxtChatbox.Text.Length; - rtxtChat.ScrollToCaret(); - } - private void _gatewayService_OnServerMessageReceived(object? sender, EventArgs e) { var msgEventArgs = (ServerMessageEventArgs)e; @@ -85,8 +79,8 @@ namespace qtc_net_client_2.Forms private void AddMessage(string message) { if (InvokeRequired) - Invoke(delegate { rtxtChat.Text += message + "\n"; }); - else rtxtChat.Text += message + "\n"; + Invoke(delegate { rtxtChat.AppendText(message + Environment.NewLine); }); + else rtxtChat.AppendText(message + Environment.NewLine); } } } diff --git a/qtc-net-client-2/Forms/DirectMessage.Designer.cs b/qtc-net-client-2/Forms/DirectMessage.Designer.cs index 6de13b3..cf85711 100644 --- a/qtc-net-client-2/Forms/DirectMessage.Designer.cs +++ b/qtc-net-client-2/Forms/DirectMessage.Designer.cs @@ -37,6 +37,7 @@ // // rtxtChat // + rtxtChat.HideSelection = false; rtxtChat.Location = new Point(12, 56); rtxtChat.Margin = new Padding(4, 3, 4, 3); rtxtChat.Name = "rtxtChat"; @@ -44,7 +45,6 @@ rtxtChat.Size = new Size(593, 317); rtxtChat.TabIndex = 6; rtxtChat.Text = ""; - rtxtChat.TextChanged += rtxtChat_TextChanged; // // btnSend // diff --git a/qtc-net-client-2/Forms/DirectMessage.cs b/qtc-net-client-2/Forms/DirectMessage.cs index c294df6..2f0a13b 100644 --- a/qtc-net-client-2/Forms/DirectMessage.cs +++ b/qtc-net-client-2/Forms/DirectMessage.cs @@ -83,12 +83,6 @@ namespace qtc_net_client_2.Forms btnSend_Click(sender, e); } - private void rtxtChat_TextChanged(object sender, EventArgs e) - { - rtxtChat.SelectionStart = rtxtChatbox.Text.Length; - rtxtChat.ScrollToCaret(); - } - private void Messages_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { if (e.NewItems != null && e.NewItems.Count > 0) @@ -98,14 +92,14 @@ namespace qtc_net_client_2.Forms Invoke(delegate () { var msg = e.NewItems.Cast().FirstOrDefault(); - rtxtChat.Text += msg; + rtxtChat.AppendText(msg + Environment.NewLine); if (!msg!.Contains(_apiService.CurrentUser.Username)) AudioService.PlaySoundEffect("sndMessage"); }); } else { var msg = e.NewItems.Cast().FirstOrDefault(); - rtxtChat.Text += msg; + rtxtChat.AppendText(msg + Environment.NewLine); if (!msg!.Contains(_apiService.CurrentUser.Username)) AudioService.PlaySoundEffect("sndMessage"); } }