From e328224d158be443099486ed405f6e8eb3a35aaf Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Fri, 17 Jun 2022 11:00:14 +0200
Subject: [PATCH] Common/Dialog: Fix long messages

---
 GUIs.Common/frmDialog.Designer.vb | 30 +++++++++++++++---------------
 GUIs.Common/frmDialog.vb          |  5 +++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/GUIs.Common/frmDialog.Designer.vb b/GUIs.Common/frmDialog.Designer.vb
index 6088a4ee..ff6234bb 100644
--- a/GUIs.Common/frmDialog.Designer.vb
+++ b/GUIs.Common/frmDialog.Designer.vb
@@ -26,7 +26,7 @@ Partial Class frmDialog
         Me.btnPositive = New DevExpress.XtraEditors.SimpleButton()
         Me.btnNegative = New DevExpress.XtraEditors.SimpleButton()
         Me.pnlContent = New DevExpress.XtraEditors.PanelControl()
-        Me.txtContent2 = New DevExpress.XtraEditors.LabelControl()
+        Me.txtContent = New DevExpress.XtraEditors.LabelControl()
         Me.SvgImageBox1 = New DevExpress.XtraEditors.SvgImageBox()
         Me.pnlHeader = New DevExpress.XtraEditors.PanelControl()
         Me.txtTitle = New DevExpress.XtraEditors.LabelControl()
@@ -68,7 +68,7 @@ Partial Class frmDialog
         '
         'pnlContent
         '
-        Me.pnlContent.Controls.Add(Me.txtContent2)
+        Me.pnlContent.Controls.Add(Me.txtContent)
         Me.pnlContent.Controls.Add(Me.SvgImageBox1)
         Me.pnlContent.Dock = System.Windows.Forms.DockStyle.Fill
         Me.pnlContent.Location = New System.Drawing.Point(0, 40)
@@ -76,19 +76,19 @@ Partial Class frmDialog
         Me.pnlContent.Size = New System.Drawing.Size(498, 131)
         Me.pnlContent.TabIndex = 3
         '
-        'txtContent2
+        'txtContent
         '
-        Me.txtContent2.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtContent2.Appearance.Options.UseFont = True
-        Me.txtContent2.Appearance.Options.UseTextOptions = True
-        Me.txtContent2.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top
-        Me.txtContent2.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap
-        Me.txtContent2.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
-        Me.txtContent2.Location = New System.Drawing.Point(71, 6)
-        Me.txtContent2.Name = "txtContent2"
-        Me.txtContent2.Size = New System.Drawing.Size(415, 119)
-        Me.txtContent2.TabIndex = 3
-        Me.txtContent2.Text = "LabelControl1"
+        Me.txtContent.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtContent.Appearance.Options.UseFont = True
+        Me.txtContent.Appearance.Options.UseTextOptions = True
+        Me.txtContent.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top
+        Me.txtContent.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap
+        Me.txtContent.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
+        Me.txtContent.Location = New System.Drawing.Point(71, 6)
+        Me.txtContent.Name = "txtContent"
+        Me.txtContent.Size = New System.Drawing.Size(415, 119)
+        Me.txtContent.TabIndex = 3
+        Me.txtContent.Text = "LabelControl1"
         '
         'SvgImageBox1
         '
@@ -182,5 +182,5 @@ Partial Class frmDialog
     Friend WithEvents SvgImageBox1 As DevExpress.XtraEditors.SvgImageBox
     Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
     Friend WithEvents txtTitle As DevExpress.XtraEditors.LabelControl
-    Friend WithEvents txtContent2 As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents txtContent As DevExpress.XtraEditors.LabelControl
 End Class
diff --git a/GUIs.Common/frmDialog.vb b/GUIs.Common/frmDialog.vb
index 10a8a424..19d3f820 100644
--- a/GUIs.Common/frmDialog.vb
+++ b/GUIs.Common/frmDialog.vb
@@ -28,7 +28,7 @@ Public Class frmDialog
         InitializeComponent()
 
         ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
-        txtContent2.Text = pMessageText
+        txtContent.Text = pMessageText
         txtTitle.Text = pTitle
 
         Select Case pDialogType
@@ -62,11 +62,12 @@ Public Class frmDialog
 
         End Select
 
-        Dim oLineBreaks = txtContent2.Text.Split(vbNewLine).Count
+        Dim oLineBreaks = txtContent.Text.Split(vbNewLine).Count
 
         If oLineBreaks > 6 Then
             Dim oHeightOffset = oLineBreaks * 20
             Height += oHeightOffset
+            txtContent.Height += oHeightOffset
         End If
 
         btnPositive.Focus()