From 61487090ed616e8c56c97b979f24882b8fe05a58 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Thu, 19 Sep 2024 16:37:15 +0200
Subject: [PATCH] QmlDesigner: Fix issues panel word wrap

Change-Id: I392985ed7a2a47a0414ea4f4094f7c0ce4fba955
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/statusbar/IssuesPanel.qml     | 38 ++++++++++++-------
 .../qmldesigner/statusbar/OutputPanel.qml     |  2 -
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/share/qtcreator/qmldesigner/statusbar/IssuesPanel.qml b/share/qtcreator/qmldesigner/statusbar/IssuesPanel.qml
index 432a6f9c2cf..36e90d024a6 100644
--- a/share/qtcreator/qmldesigner/statusbar/IssuesPanel.qml
+++ b/share/qtcreator/qmldesigner/statusbar/IssuesPanel.qml
@@ -11,7 +11,7 @@ import StudioTheme as StudioTheme
 import OutputPane
 
 ScrollView {
-    id: issuesPanel
+    id: root
 
     signal showCodeViewSignal
 
@@ -23,12 +23,12 @@ ScrollView {
     ScrollBar.vertical: StudioControls.TransientScrollBar {
         id: verticalScrollBar
         style: StudioTheme.Values.viewStyle
-        parent: issuesPanel
-        x: issuesPanel.width - verticalScrollBar.width
+        parent: root
+        x: root.width - verticalScrollBar.width
         y: 0
-        height: issuesPanel.availableHeight
+        height: root.availableHeight
         orientation: Qt.Vertical
-        show: (issuesPanel.hovered || issuesPanel.focus) && verticalScrollBar.isNeeded
+        show: (root.hovered || root.focus) && verticalScrollBar.isNeeded
     }
 
     ColumnLayout {
@@ -37,46 +37,58 @@ ScrollView {
 
             model: MessageModel { id: messageModel }
 
-            delegate: RowLayout {
-                spacing: 10
+            delegate: Row {
+                id: row
 
                 required property int index
                 required property string message
                 required property string location
                 required property string type
 
+                width: root.width
+                spacing: 10
+
                 Text {
+                    id: labelIcon
                     font.family: StudioTheme.Constants.iconFont.family
                     font.pixelSize: StudioTheme.Values.baseIconFontSize
                     color: (type == "Warning") ? StudioTheme.Values.themeAmberLight
                                                : StudioTheme.Values.themeRedLight
                     text: (type == "Warning") ? StudioTheme.Constants.warning2_medium
                                               : StudioTheme.Constants.error_medium
+                    width: 18
+                    height: 18
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
                 }
 
                 Text {
+                    id: labelLocation
                     text: location
                     color: "#57b9fc"
-                    font.pixelSize: 12
+                    font.pixelSize: StudioTheme.Values.baseFontSize
                     verticalAlignment: Text.AlignVCenter
-                    Layout.preferredHeight: 18
-                    font.underline: mouseArea.containsMouse ? true : false
+                    font.underline: mouseArea.containsMouse
+                    height: 18
 
                     MouseArea {
                         id: mouseArea
                         anchors.fill: parent
                         hoverEnabled: true
-                        cursorShape: mouseArea.containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
+                        cursorShape: mouseArea.containsMouse ? Qt.PointingHandCursor
+                                                             : Qt.ArrowCursor
                     }
                 }
 
                 Text {
+                    id: labelInfo
                     color: (type == "Warning") ? StudioTheme.Values.themeAmberLight
                                                : StudioTheme.Values.themeRedLight
                     text: message
                     font.pixelSize: StudioTheme.Values.baseFontSize
-                    verticalAlignment: Text.AlignVCenter
-                    Layout.preferredHeight: 18
+                    verticalAlignment: Text.AlignTop
+                    wrapMode: Text.WordWrap
+                    width: row.width - labelIcon.width - labelLocation.width - row.spacing * 2
                 }
             }
         }
diff --git a/share/qtcreator/qmldesigner/statusbar/OutputPanel.qml b/share/qtcreator/qmldesigner/statusbar/OutputPanel.qml
index 56b1083ee80..f54e96290ea 100644
--- a/share/qtcreator/qmldesigner/statusbar/OutputPanel.qml
+++ b/share/qtcreator/qmldesigner/statusbar/OutputPanel.qml
@@ -43,8 +43,6 @@ ScrollView {
     }
 
     Column {
-        id: clayout
-
         Repeater {
             id: parentList