blue/squawk
blue/squawk
2
3
Fork 8
Code Issues 23 Pull requests 3 Releases 10 Wiki Activity Actions

some visual tweaks, moving on message delivery statuses

Browse source
This commit is contained in:
Blue 2020-02-04 18:14:51 +03:00
parent a4136ff9fe
commit ed56cca2e7
7 changed files with 62 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ui/widgets/conversation.cpp
View file

@ -46,7 +46,8 @@ Conversation::Conversation(bool muc, Models::Account* acc, const QString pJid, c
scroll(down),
manualSliderChange(false),
requestingHistory(false),
everShown(false)
everShown(false),
tsb(QApplication::style()->styleHint(QStyle::SH_ScrollBar_Transient) == 1)
{
m_ui->setupUi(this);
@ -77,8 +78,12 @@ Conversation::Conversation(bool muc, Models::Account* acc, const QString pJid, c
QScrollBar* vs = m_ui->scrollArea->verticalScrollBar();
m_ui->scrollArea->setWidget(line);
vs->installEventFilter(&vis);
vs->setBackgroundRole(QPalette::Base);
vs->setAutoFillBackground(true);
if (!tsb) {
vs->setBackgroundRole(QPalette::Base);
vs->setAutoFillBackground(true);
}
connect(vs, &QScrollBar::valueChanged, this, &Conversation::onSliderValueChanged);
m_ui->scrollArea->installEventFilter(&scrollResizeCatcher);
m_ui->filesPanel->installEventFilter(&attachResizeCatcher);
@ -313,8 +318,9 @@ void Conversation::onScrollResize()
if (everShown) {
int size = m_ui->scrollArea->width();
QScrollBar* bar = m_ui->scrollArea->verticalScrollBar();
if (bar->isVisible()) {
if (bar->isVisible() && !tsb) {
size -= bar->width();
}
line->setMaximumWidth(size);
}

1
ui/widgets/conversation.h
View file

@ -135,6 +135,7 @@ protected:
bool manualSliderChange;
bool requestingHistory;
bool everShown;
bool tsb; //transient scroll bars
};
#endif // CONVERSATION_H