From 018fe2ab102ed502a1e41d42e8e6cc4ba71a648c Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Tue, 4 Sep 2018 22:29:21 +0200
Subject: [PATCH] fixed some shtuff

---
 src/widgets/dialogs/SettingsDialog.cpp       | 3 ++-
 src/widgets/helper/NotebookTab.cpp           | 4 +++-
 src/widgets/settingspages/ModerationPage.cpp | 2 +-
 src/widgets/settingspages/SettingsPage.cpp   | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/widgets/dialogs/SettingsDialog.cpp b/src/widgets/dialogs/SettingsDialog.cpp
index 0bb782e30..a4dbec696 100644
--- a/src/widgets/dialogs/SettingsDialog.cpp
+++ b/src/widgets/dialogs/SettingsDialog.cpp
@@ -34,6 +34,7 @@ SettingsDialog::SettingsDialog()
     this->scaleChangedEvent(this->getScale());
 
     this->overrideBackgroundColor_ = QColor("#282828");
+    this->themeChangedEvent();
 }
 
 void SettingsDialog::initUi()
@@ -185,7 +186,7 @@ void SettingsDialog::themeChangedEvent()
     BaseWindow::themeChangedEvent();
 
     QPalette palette;
-    palette.setColor(QPalette::Background, QColor("#444"));
+    palette.setColor(QPalette::Background, QColor("#222"));
     this->setPalette(palette);
 }
 
diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp
index 15388e34c..bb01fc460 100644
--- a/src/widgets/helper/NotebookTab.cpp
+++ b/src/widgets/helper/NotebookTab.cpp
@@ -311,6 +311,8 @@ void NotebookTab::paintEvent(QPaintEvent *)
     if (this->shouldDrawXButton()) {
         QRect xRect = this->getXRect();
         if (!xRect.isNull()) {
+            if (this->selected_) xRect.moveTop(xRect.top() - 1);
+
             painter.setBrush(QColor("#fff"));
 
             if (this->mouseOverX_) {
@@ -472,7 +474,7 @@ QRect NotebookTab::getXRect()
 
     float s = this->getScale();
     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));
 }
 
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
index e7210f5a6..d50e59bc0 100644
--- a/src/widgets/settingspages/ModerationPage.cpp
+++ b/src/widgets/settingspages/ModerationPage.cpp
@@ -149,7 +149,7 @@ ModerationPage::ModerationPage()
     auto modMode = tabs.appendTab(new QVBoxLayout, "Moderation buttons");
     {
         // 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->setStyleSheet("color: #bbb");
         // clang-format on
diff --git a/src/widgets/settingspages/SettingsPage.cpp b/src/widgets/settingspages/SettingsPage.cpp
index e74095986..a70904bc3 100644
--- a/src/widgets/settingspages/SettingsPage.cpp
+++ b/src/widgets/settingspages/SettingsPage.cpp
@@ -1,6 +1,7 @@
 #include "SettingsPage.hpp"
 
 #include <QDebug>
+#include <QPainter>
 
 namespace chatterino {