Commit beb02b03 authored by Waqar Ahmed's avatar Waqar Ahmed
Browse files

Fix small tips also scrollable

parent 27c3298b
...@@ -171,8 +171,8 @@ public: ...@@ -171,8 +171,8 @@ public:
return; return;
hl.setText(text); hl.setText(text);
resizeTip(text);
setHtml(hl.html()); setHtml(hl.html());
resizeTip(text);
} }
void setView(KTextEditor::View *view) void setView(KTextEditor::View *view)
...@@ -197,7 +197,7 @@ public: ...@@ -197,7 +197,7 @@ public:
: QTextBrowser(parent) : QTextBrowser(parent)
{ {
setWindowFlags(Qt::FramelessWindowHint | Qt::BypassGraphicsProxyWidget | Qt::ToolTip); setWindowFlags(Qt::FramelessWindowHint | Qt::BypassGraphicsProxyWidget | Qt::ToolTip);
document()->setDocumentMargin(2); document()->setDocumentMargin(5);
setFrameStyle(QFrame::Box); setFrameStyle(QFrame::Box);
connect(&m_hideTimer, &QTimer::timeout, this, &Tooltip::hideTooltip); connect(&m_hideTimer, &QTimer::timeout, this, &Tooltip::hideTooltip);
...@@ -259,7 +259,17 @@ public: ...@@ -259,7 +259,17 @@ public:
{ {
QFontMetrics fm(font()); QFontMetrics fm(font());
QSize size = fm.size(0, text); QSize size = fm.size(0, text);
size.setHeight(std::min(size.height(), m_view->height() / 3));
// make sure we have the correct height
// size above gives us correct width but not
// correct height
qreal totalHeight = document()->size().height();
// add +1 line height to prevent scrollbar from appearing with small
// tooltips
int lineHeight = totalHeight / document()->lineCount();
const int height = totalHeight + lineHeight;
size.setHeight(std::min(height, m_view->height() / 3));
size.setWidth(std::min(size.width(), m_view->width() / 2)); size.setWidth(std::min(size.width(), m_view->width() / 2));
resize(size); resize(size);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment