feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Make diagnostic display adapt to size of the info bar

Browse Source 
Change-Id: Ibc7431234b8a68c8e2b0c3f25387de96b203c4c5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-03-23 13:30:11 +01:00
parent 48c17a1e07
commit b26143561a
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp
View File

@@ -112,10 +112,16 @@ private:
label->setTextFormat(Qt::RichText); label->setTextFormat(Qt::RichText);
label->setText(text); label->setText(text);
label->setTextInteractionFlags(Qt::TextBrowserInteraction); label->setTextInteractionFlags(Qt::TextBrowserInteraction);
// Using "setWordWrap(true)" alone will wrap the text already for small
// widths, so do not require word wrapping until we hit limits. if (m_displayHints.limitWidth) {
if (m_displayHints.limitWidth && label->sizeHint().width() > widthLimit()) { const int limit = widthLimit();
label->setMaximumWidth(widthLimit()); // Using "setWordWrap(true)" alone will wrap the text already for small
// widths, so do not require word wrapping until we hit limits.
if (label->sizeHint().width() > limit) {
label->setMaximumWidth(limit);
label->setWordWrap(true);
}
} else {
label->setWordWrap(true); label->setWordWrap(true);
} }
@@ -141,7 +147,7 @@ private:
QString htmlText(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics) QString htmlText(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics)
{ {
// For debugging, add: style='border-width:1px;border-color:black' // For debugging, add: style='border-width:1px;border-color:black'
QString text = "<table cellspacing='0' cellpadding='0'>"; QString text = "<table cellspacing='0' cellpadding='0' width='100%'>";
foreach (const ClangBackEnd::DiagnosticContainer &diagnostic, diagnostics) foreach (const ClangBackEnd::DiagnosticContainer &diagnostic, diagnostics)
text.append(tableRows(diagnostic)); text.append(tableRows(diagnostic));