kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

assure that the size hint calculation and the painting code are consistent

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=927623
This commit is contained in:
Peter Penz 2009-02-17 22:24:14 +00:00
parent 85dbeb2598
commit 93b955c3e6
2 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/panels/information/metatextlabel.cpp
View file

@ -71,9 +71,8 @@ void MetaTextLabel::paintEvent(QPaintEvent* event)
const int infoWidth = width() / 2;
const int labelWidth = infoWidth - 2 * Spacing;
const int infoX = infoWidth;
const int maxHeight = fontMetrics().height() * 5;
const int maxHeight = maxHeightPerLine();
QRect boundingRect;
foreach (const MetaInfo& metaInfo, m_metaInfos) {
// draw label (e. g. "Date:")
painter.setPen(labelColor);
@ -85,17 +84,27 @@ void MetaTextLabel::paintEvent(QPaintEvent* event)
painter.setPen(infoColor);
painter.drawText(infoX, y, infoWidth, maxHeight,
Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap,
metaInfo.info,
&boundingRect);
metaInfo.info);
y += boundingRect.height() + Spacing;
y += requiredHeight(metaInfo);
}
}
void MetaTextLabel::resizeEvent(QResizeEvent* event)
{
QWidget::resizeEvent(event);
int minimumHeight = 0;
foreach (const MetaInfo& metaInfo, m_metaInfos) {
minimumHeight += requiredHeight(metaInfo);
}
setMinimumHeight(minimumHeight);
}
int MetaTextLabel::requiredHeight(const MetaInfo& metaInfo) const
{
QTextOption textOption;
textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
textOption.setWrapMode(QTextOption::WordWrap);
qreal height = 0;
const int leading = fontMetrics().leading();
@ -115,7 +124,17 @@ int MetaTextLabel::requiredHeight(const MetaInfo& metaInfo) const
}
textLayout.endLayout();
return static_cast<int>(height) + Spacing;
int adjustedHeight = static_cast<int>(height);
if (adjustedHeight > maxHeightPerLine()) {
adjustedHeight = maxHeightPerLine();
}
return adjustedHeight + Spacing;
}
int MetaTextLabel::maxHeightPerLine() const
{
return fontMetrics().height() * 100;
}
#include "metatextlabel.moc"

8
src/panels/information/metatextlabel.h
View file

@ -40,6 +40,7 @@ public:
protected:
virtual void paintEvent(QPaintEvent* event);
virtual void resizeEvent(QResizeEvent* event);
private:
enum { Spacing = 2 };
@ -57,6 +58,13 @@ private:
* fit into the available width of the widget.
*/
int requiredHeight(const MetaInfo& metaInfo) const;
/**
* Returns the maximum height in pixels for the text of
* one added line. The returned value does not contain
* any additional spacing between texts.
*/
int maxHeightPerLine() const;
};
#endif