projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a6e7f6f
)
Fix line spacing being wrong for some people (partially cut off ChatLines)
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 17 Sep 2008 15:28:29 +0000
(17:28 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 17 Sep 2008 15:28:29 +0000
(17:28 +0200)
src/qtui/chatitem.cpp
patch
|
blob
|
history
diff --git
a/src/qtui/chatitem.cpp
b/src/qtui/chatitem.cpp
index
9519d60
..
50d74f5
100644
(file)
--- a/
src/qtui/chatitem.cpp
+++ b/
src/qtui/chatitem.cpp
@@
-63,7
+63,6
@@
qreal ChatItem::setGeometry(qreal w, qreal h) {
prepareGeometryChange();
_boundingRect.setWidth(w);
if(h < 0) h = computeHeight();
prepareGeometryChange();
_boundingRect.setWidth(w);
if(h < 0) h = computeHeight();
- //if(h < 0) h = fontMetrics()->lineSpacing(); // only contents can be multi-line
_boundingRect.setHeight(h);
if(haveLayout()) updateLayout();
return h;
_boundingRect.setHeight(h);
if(haveLayout()) updateLayout();
return h;
@@
-296,7
+295,7
@@
void ContentsChatItem::updateLayout() {
int col = finder.nextWrapColumn();
line.setNumColumns(col >= 0 ? col - line.textStart() : layout()->text().length());
line.setPosition(QPointF(0, h));
int col = finder.nextWrapColumn();
line.setNumColumns(col >= 0 ? col - line.textStart() : layout()->text().length());
line.setPosition(QPointF(0, h));
- h +=
line.height() + fontMetrics()->lead
ing();
+ h +=
fontMetrics()->lineSpac
ing();
}
layout()->endLayout();
}
}
layout()->endLayout();
}