From 14c332bd166076a39a8a86c2531784b2ebdda086 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Mon, 19 Oct 2015 17:31:17 +0200 Subject: [PATCH] Fixed chat --- .../ErgometerApplication/ChatItem.cs | 4 ++-- .../ErgometerApplication/MainClient.cs | 2 +- .../ErgometerApplication/PanelClientChat.cs | 5 ++++- .../bin/Debug/ErgometerLibrary.dll | Bin 24064 -> 24064 bytes 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ErgometerApplication/ErgometerApplication/ChatItem.cs b/ErgometerApplication/ErgometerApplication/ChatItem.cs index 5cd9cd4..00c9b18 100644 --- a/ErgometerApplication/ErgometerApplication/ChatItem.cs +++ b/ErgometerApplication/ErgometerApplication/ChatItem.cs @@ -20,7 +20,7 @@ namespace ErgometerApplication this.setAppearance(isDoctor); this.Controls.Add(this.messageLabel); this.Controls.Add(this.timeLabel); - this.MinimumSize = new System.Drawing.Size(100, 40); + this.MinimumSize = new System.Drawing.Size(150, 60); this.Name = "messageContainer"; this.Padding = new System.Windows.Forms.Padding(6); @@ -31,7 +31,7 @@ namespace ErgometerApplication this.messageLabel.Dock = System.Windows.Forms.DockStyle.Fill; this.messageLabel.Font = new System.Drawing.Font("Segoe UI Semibold", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.messageLabel.Location = new System.Drawing.Point(6, 6); - this.messageLabel.MaximumSize = new System.Drawing.Size(190, 0); + this.messageLabel.MaximumSize = new System.Drawing.Size(250, 0); this.messageLabel.Size = new System.Drawing.Size(121, 20); this.messageLabel.Text = message; // diff --git a/ErgometerApplication/ErgometerApplication/MainClient.cs b/ErgometerApplication/ErgometerApplication/MainClient.cs index 9a2bfdf..f39bc14 100644 --- a/ErgometerApplication/ErgometerApplication/MainClient.cs +++ b/ErgometerApplication/ErgometerApplication/MainClient.cs @@ -160,7 +160,7 @@ namespace ErgometerApplication break; case NetCommand.CommandType.CHAT: Chat.Add(new ChatMessage(Name, command.ChatMessage, true)); - Client.chat.AddChatItem(command.ChatMessage); + Client.chat.Invoke(Client.chat.passChatMessage, new Object[] {command.ChatMessage, Helper.MillisecondsToTime(command.Timestamp), true}); break; case NetCommand.CommandType.RESPONSE: Console.WriteLine(command.Response.ToString()); diff --git a/ErgometerApplication/ErgometerApplication/PanelClientChat.cs b/ErgometerApplication/ErgometerApplication/PanelClientChat.cs index b1eb161..0c4d7b9 100644 --- a/ErgometerApplication/ErgometerApplication/PanelClientChat.cs +++ b/ErgometerApplication/ErgometerApplication/PanelClientChat.cs @@ -140,7 +140,7 @@ namespace ErgometerApplication this.Name = "container"; this.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.panel3_MouseWheel); - Form.CheckForIllegalCrossThreadCalls = false; + passChatMessage = new ChatDelegate(this.AddChatItem); } private void button1_Click(object sender, EventArgs e) @@ -203,5 +203,8 @@ namespace ErgometerApplication button1_Click(this, new EventArgs()); } } + + public delegate void ChatDelegate(string text, string time, bool isDoctor); + public ChatDelegate passChatMessage; } } diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll index 1e827ccf1b5839b8536b077379a0d830bd4f6500..68219db59007ff920ba2496f5cd70ae8c1dd23ad 100644 GIT binary patch delta 8537 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 HQ||tMsGuYC delta 8844 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