X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fchatline.cpp;h=f0772b315e126eb79bd9d61d52b9d16ede4ea2b4;hb=011d2825dd89d2f93a72a49748581b16cc9bdb50;hp=00220bb91a0165d435c3196009c2c4914d6d140a;hpb=e178f81f44f5e305315f7755ca404c2a5f992711;p=quassel.git

diff --git a/src/qtui/chatline.cpp b/src/qtui/chatline.cpp
index 00220bb9..f0772b31 100644
--- a/src/qtui/chatline.cpp
+++ b/src/qtui/chatline.cpp
@@ -75,9 +75,10 @@ ChatItem &ChatLine::item(ChatLineModel::ColumnType column) {
 // NOTE: senderPos and contentsPos are in ChatLines coordinate system!
 qreal ChatLine::setColumns(const qreal &timestampWidth, const qreal &senderWidth, const qreal &contentsWidth,
 			   const QPointF &senderPos, const QPointF &contentsPos) {
-  _height = _contentsItem.setGeometryByWidth(contentsWidth);
-  _senderItem.setGeometry(senderWidth, _height);
-  _timestampItem.setGeometry(timestampWidth, _height);
+  prepareGeometryChange();
+  qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
+  _senderItem.setGeometry(senderWidth, height);
+  _timestampItem.setGeometry(timestampWidth, height);
 
   _senderItem.setPos(senderPos);
   _contentsItem.setPos(contentsPos);
@@ -86,6 +87,9 @@ qreal ChatLine::setColumns(const qreal &timestampWidth, const qreal &senderWidth
   _senderItem.clearLayout();
   _timestampItem.clearLayout();
 
+
+  _height = height;
+
   return _height;
 }
 
@@ -93,11 +97,13 @@ qreal ChatLine::setColumns(const qreal &timestampWidth, const qreal &senderWidth
 //  a) calling prepareGeometryChange() immediately before setColumns()
 //  b) calling Chatline::setPos() immediately afterwards
 qreal ChatLine::setGeometryByWidth(const qreal &width, const qreal &contentsWidth) {
-  _width = width;
-  _height = _contentsItem.setGeometryByWidth(contentsWidth);
-  _timestampItem.setHeight(_height);
-  _senderItem.setHeight(_height);
+  prepareGeometryChange();
+  qreal height = _contentsItem.setGeometryByWidth(contentsWidth);
+  _timestampItem.setHeight(height);
+  _senderItem.setHeight(height);
   _contentsItem.clearLayout();
+  _height = height;
+  _width = width;
   return _height;
 }