Merge remote-tracking branch 'origin/dev' into dev

2015-11-02 13:31:07 +01:00
parent dcd98e44d2 afaeeda67f
commit 7f0e387065
3 changed files with 3 additions and 1 deletions
@@ -49,6 +49,7 @@ namespace ErgometerApplication
            this.UitlegText.Location = new System.Drawing.Point(12, 35);
            this.UitlegText.Name = "UitlegText";
            this.UitlegText.Size = new System.Drawing.Size(800, 32);
+            this.UitlegText.MaximumSize = new System.Drawing.Size(400, 0);
            this.UitlegText.TabIndex = 2;
            this.UitlegText.Text = text;
        }
@@ -55,7 +55,7 @@ namespace ErgometerDoctorApplication
                    window.panelClientChat.Invoke(window.panelClientChat.passChatMessage, new Object[] { chat });
                    break;
                case NetCommand.CommandType.UITLEG:
-                    window.updateStepsText(command.UitlegText);
+                    window.steps.UitlegText.Invoke((MethodInvoker)(() => window.steps.UitlegText.Text = command.UitlegText));
                    break;
            }
        }
@@ -48,6 +48,7 @@ namespace ErgometerApplication
            this.UitlegText.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.UitlegText.Location = new System.Drawing.Point(12, 35);
            this.UitlegText.Name = "UitlegText";
+            this.UitlegText.MaximumSize = new System.Drawing.Size(400, 0);
            this.UitlegText.Size = new System.Drawing.Size(800, 32);
            this.UitlegText.TabIndex = 2;
            this.UitlegText.Text = text;