noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/fourtf/chatterino2

Browse source
This commit is contained in:
fourtf 2017-08-17 19:15:55 +02:00
commit ab6474150d
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qss/settings.qss
View file

@ -13,3 +13,7 @@ SettingsDialogTab:hover {
QLabel, QCheckBox, QGroupBox, SettingsDialogTab { QLabel, QCheckBox, QGroupBox, SettingsDialogTab {
color: white; color: white;
} }
QGroupBox {
background-color: #444;
}

4
src/widgets/chatwidgetview.cpp
View file

@ -26,7 +26,9 @@ ChatWidgetView::ChatWidgetView(ChatWidget *_chatWidget)
, scrollBar(this) , scrollBar(this)
, userPopupWidget(_chatWidget->getChannelRef()) , userPopupWidget(_chatWidget->getChannelRef())
{ {
#ifndef Q_OS_MAC
this->setAttribute(Qt::WA_OpaquePaintEvent); this->setAttribute(Qt::WA_OpaquePaintEvent);
#endif
this->setMouseTracking(true); this->setMouseTracking(true);
QObject::connect(&SettingsManager::getInstance(), &SettingsManager::wordTypeMaskChanged, this, QObject::connect(&SettingsManager::getInstance(), &SettingsManager::wordTypeMaskChanged, this,
@ -152,6 +154,7 @@ void ChatWidgetView::paintEvent(QPaintEvent * /*event*/)
_painter.setRenderHint(QPainter::SmoothPixmapTransform); _painter.setRenderHint(QPainter::SmoothPixmapTransform);
// only update gif emotes // only update gif emotes
#ifndef Q_OS_MAC
if (this->onlyUpdateEmotes) { if (this->onlyUpdateEmotes) {
this->onlyUpdateEmotes = false; this->onlyUpdateEmotes = false;
@ -163,6 +166,7 @@ void ChatWidgetView::paintEvent(QPaintEvent * /*event*/)
return; return;
} }
#endif
// update all messages // update all messages
this->gifEmotes.clear(); this->gifEmotes.clear();