diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-03-23 13:30:11 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-03-27 08:13:10 +0000 |
commit | b26143561af5fe476f0c5ee933d428ace1a66ad0 (patch) | |
tree | 6ba0c0a211e516e5ff9bae0fd4d2b6dfffc09ec8 /src | |
parent | 48c17a1e07e29e93e0b23ad6a64d457835497ae6 (diff) | |
download | qt-creator-b26143561af5fe476f0c5ee933d428ace1a66ad0.tar.gz |
Clang: Make diagnostic display adapt to size of the info bar
Change-Id: Ibc7431234b8a68c8e2b0c3f25387de96b203c4c5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp index 42c77883bf..62870880fd 100644 --- a/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp +++ b/src/plugins/clangcodemodel/clangdiagnostictooltipwidget.cpp @@ -112,10 +112,16 @@ private: label->setTextFormat(Qt::RichText); label->setText(text); 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 && label->sizeHint().width() > widthLimit()) { - label->setMaximumWidth(widthLimit()); + + if (m_displayHints.limitWidth) { + const int limit = 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); } @@ -141,7 +147,7 @@ private: QString htmlText(const QVector<ClangBackEnd::DiagnosticContainer> &diagnostics) { // 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) text.append(tableRows(diagnostic)); |