diff --git a/sources/chat-area/ChatArea.cpp b/sources/chat-area/ChatArea.cpp index 568084a..807c205 100644 --- a/sources/chat-area/ChatArea.cpp +++ b/sources/chat-area/ChatArea.cpp @@ -59,7 +59,7 @@ ChatArea::ChatArea (Backend& backend, BackendChannel& channel, ChannelItem* tree ui->listWidget->backend = &backend; ui->titleLabel->setText (channel.display_name); - ui->statusLabel->setText (channel.getChannelDescription ()); + ui->headerLabel->setText (channel.getChannelDescription ()); setTextEditWidgetHeight (texteditDefaultHeight); @@ -79,9 +79,7 @@ ChatArea::ChatArea (Backend& backend, BackendChannel& channel, ChannelItem* tree ui->statusLabel->setText (user->status); }); - if (ui->statusLabel->text().isEmpty()) { - ui->statusLabel->setText (user->status); - } + ui->statusLabel->setText (user->status); } else { ui->userAvatar->clear(); @@ -117,7 +115,7 @@ ChatArea::ChatArea (Backend& backend, BackendChannel& channel, ChannelItem* tree connect (&channel, &BackendChannel::onUpdated, [this] { ui->titleLabel->setText (this->channel.display_name); this->treeItem->setLabel (this->channel.display_name); - ui->statusLabel->setText (this->channel.getChannelDescription ()); + ui->headerLabel->setText (this->channel.getChannelDescription ()); }); diff --git a/sources/chat-area/ChatArea.ui b/sources/chat-area/ChatArea.ui index c0c42a3..1bac706 100644 --- a/sources/chat-area/ChatArea.ui +++ b/sources/chat-area/ChatArea.ui @@ -136,7 +136,7 @@ QFrame::NoFrame - TextLabel + Status @@ -168,6 +168,9 @@ N members + + 120 + @@ -175,12 +178,34 @@ N pinned posts + + 120 + :/img/pushpin.png:/img/pushpin.png + + + + + 0 + 0 + + + + padding-left:1px; padding-bottom: 3px + + + QFrame::NoFrame + + + Channel header + + +