mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Backport: Only increase the height of the statusbar for long texts if the message type is not DolphinStatusBar::Default (otherwise the layout of the icons view might get changed when hovering items).
svn path=/branches/KDE/4.0/kdebase/apps/; revision=759061
This commit is contained in:
parent
0e58c734c1
commit
49691b36b4
|
@ -229,15 +229,20 @@ void StatusBarMessageLabel::assureVisibleText()
|
|||
return;
|
||||
}
|
||||
|
||||
// calculate the required height of the widget thats
|
||||
// needed for having a fully visible text
|
||||
QFontMetrics fontMetrics(font());
|
||||
const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(),
|
||||
Qt::AlignVCenter | Qt::TextWordWrap,
|
||||
m_text));
|
||||
int requiredHeight = bounds.height();
|
||||
if (requiredHeight < m_minTextHeight) {
|
||||
requiredHeight = m_minTextHeight;
|
||||
int requiredHeight = m_minTextHeight;
|
||||
if (m_type != DolphinStatusBar::Default) {
|
||||
// Calculate the required height of the widget thats
|
||||
// needed for having a fully visible text. Note that for the default
|
||||
// statusbar type (e. g. hover information) increasing the text height
|
||||
// is not wanted, as this might rearrange the layout of items.
|
||||
|
||||
QFontMetrics fontMetrics(font());
|
||||
const QRect bounds(fontMetrics.boundingRect(0, 0, availableTextWidth(), height(),
|
||||
Qt::AlignVCenter | Qt::TextWordWrap, m_text));
|
||||
requiredHeight = bounds.height();
|
||||
if (requiredHeight < m_minTextHeight) {
|
||||
requiredHeight = m_minTextHeight;
|
||||
}
|
||||
}
|
||||
|
||||
// Increase/decrease the current height of the widget to the
|
||||
|
|
Loading…
Reference in a new issue