noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed some shtuff

Browse source
This commit is contained in:
fourtf 2018-09-04 22:29:21 +02:00
parent 1d16c0cf77
commit 018fe2ab10
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/widgets/dialogs/SettingsDialog.cpp
View file

@ -34,6 +34,7 @@ SettingsDialog::SettingsDialog()
this->scaleChangedEvent(this->getScale()); this->scaleChangedEvent(this->getScale());
this->overrideBackgroundColor_ = QColor("#282828"); this->overrideBackgroundColor_ = QColor("#282828");
this->themeChangedEvent();
} }
void SettingsDialog::initUi() void SettingsDialog::initUi()
@ -185,7 +186,7 @@ void SettingsDialog::themeChangedEvent()
BaseWindow::themeChangedEvent(); BaseWindow::themeChangedEvent();
QPalette palette; QPalette palette;
palette.setColor(QPalette::Background, QColor("#444")); palette.setColor(QPalette::Background, QColor("#222"));
this->setPalette(palette); this->setPalette(palette);
} }

4
src/widgets/helper/NotebookTab.cpp
View file

@ -311,6 +311,8 @@ void NotebookTab::paintEvent(QPaintEvent *)
if (this->shouldDrawXButton()) { if (this->shouldDrawXButton()) {
QRect xRect = this->getXRect(); QRect xRect = this->getXRect();
if (!xRect.isNull()) { if (!xRect.isNull()) {
if (this->selected_) xRect.moveTop(xRect.top() - 1);
painter.setBrush(QColor("#fff")); painter.setBrush(QColor("#fff"));
if (this->mouseOverX_) { if (this->mouseOverX_) {
@ -472,7 +474,7 @@ QRect NotebookTab::getXRect()
float s = this->getScale(); float s = this->getScale();
return QRect(this->width() - static_cast<int>(20 * s), return QRect(this->width() - static_cast<int>(20 * s),
static_cast<int>(6 * s), static_cast<int>(16 * s), static_cast<int>(9 * s), static_cast<int>(16 * s),
static_cast<int>(16 * s)); static_cast<int>(16 * s));
} }

2
src/widgets/settingspages/ModerationPage.cpp
View file

@ -149,7 +149,7 @@ ModerationPage::ModerationPage()
auto modMode = tabs.appendTab(new QVBoxLayout, "Moderation buttons"); auto modMode = tabs.appendTab(new QVBoxLayout, "Moderation buttons");
{ {
// clang-format off // clang-format off
auto label = modMode.emplace<QLabel>("Click the moderation mod button (<img width='18' height='18' src=':/images/moderatormode_disabled.png'>) in a channel that you moderate to enable moderator mode.<br>"); auto label = modMode.emplace<QLabel>("Click the moderation mod button (<img width='18' height='18' src=':/buttons/modModeDisabled.png'>) in a channel that you moderate to enable moderator mode.<br>");
label->setWordWrap(true); label->setWordWrap(true);
label->setStyleSheet("color: #bbb"); label->setStyleSheet("color: #bbb");
// clang-format on // clang-format on

1
src/widgets/settingspages/SettingsPage.cpp
View file

@ -1,6 +1,7 @@
#include "SettingsPage.hpp" #include "SettingsPage.hpp"
#include <QDebug> #include <QDebug>
#include <QPainter>
namespace chatterino { namespace chatterino {