From a895261bd5fe880aa2e9206b9663c210805a6166 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 20 Dec 2014 16:53:42 +0000 Subject: [PATCH] Set a Text Alignment when Status Label is hided/shown. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7774 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/chat/ChatWidget.cpp | 5 +++++ retroshare-gui/src/gui/chat/ChatWidget.ui | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index c0dd9d555..b919b15cb 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1408,10 +1408,15 @@ void ChatWidget::updatePeersCustomStateString(const QString& peer_id, const QStr // the peers status string has changed if (status_string.isEmpty()) { ui->statusMessageLabel->hide(); + ui->titleLabel->setAlignment ( Qt::AlignTop ); + ui->statusLabel->setAlignment ( Qt::AlignTop ); + } else { ui->statusMessageLabel->show(); status_text = RsHtml().formatText(NULL, status_string, RSHTML_FORMATTEXT_EMBED_SMILEYS | RSHTML_FORMATTEXT_EMBED_LINKS); ui->statusMessageLabel->setText(status_text); + ui->titleLabel->setAlignment ( Qt::AlignVCenter ); + ui->statusLabel->setAlignment ( Qt::AlignVCenter ); } } } diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui index 001b9d5ee..4dd64aff8 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.ui +++ b/retroshare-gui/src/gui/chat/ChatWidget.ui @@ -43,7 +43,7 @@ 2 - 0 + 3 3 @@ -98,7 +98,7 @@ 40 - 20 + 28 @@ -574,8 +574,8 @@ border-image: url(:/images/closepressed.png) - 22 - 22 + 24 + 24 @@ -673,8 +673,8 @@ border-image: url(:/images/closepressed.png) - 22 - 22 + 24 + 24