1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr1391'

This commit is contained in:
tux3 2015-03-14 19:51:58 +01:00
commit ac9b327fe7
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -30,7 +30,9 @@ ChatLineContentProxy::ChatLineContentProxy(QWidget* widget, int minWidth, float
QRectF ChatLineContentProxy::boundingRect() const QRectF ChatLineContentProxy::boundingRect() const
{ {
return proxy->boundingRect(); QRectF result = proxy->boundingRect();
result.setHeight(result.height() + 5);
return result;
} }
void ChatLineContentProxy::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void ChatLineContentProxy::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
@ -41,7 +43,7 @@ void ChatLineContentProxy::paint(QPainter *painter, const QStyleOptionGraphicsIt
qreal ChatLineContentProxy::getAscent() const qreal ChatLineContentProxy::getAscent() const
{ {
return 0; return 7.0;
} }
QWidget *ChatLineContentProxy::getWidget() const QWidget *ChatLineContentProxy::getWidget() const