Merge remote-tracking branch 'origin/11.0'

Change-Id: I6c2a1d497aae9bda45c4aae47fb0be6c61c1ec29

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index c829e4f087..7416c383e7 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -618,6 +618,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 
     painter->save();
     m_doc.setHtml(options.text);
+    m_doc.setTextWidth(options.rect.width());
     options.text = "";
     options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);
     painter->translate(options.rect.left(), options.rect.top());
@@ -645,9 +646,12 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
         return QStyledItemDelegate::sizeHint(option, index);
 
     QStyleOptionViewItem options = option;
+    options.initFrom(options.widget);
     initStyleOption(&options, index);
     m_doc.setHtml(options.text);
-    m_doc.setTextWidth(options.rect.width());
+    const auto view = qobject_cast<const QTreeView *>(options.widget);
+    QTC_ASSERT(view, return {});
+    m_doc.setTextWidth(view->width() * 0.85 - view->indentation());
     return QSize(m_doc.idealWidth(), m_doc.size().height());
 }