Fix minor stylistic issues on the nheko theme

6 files changed, 62 insertions, 2 deletions

diff --git a/src/LeaveRoomDialog.cc b/src/LeaveRoomDialog.cc
index cd4a3260..a6aedbfe 100644
--- a/src/LeaveRoomDialog.cc
+++ b/src/LeaveRoomDialog.cc
@@ -1,5 +1,6 @@
 #include <QLabel>
 #include <QVBoxLayout>
+#include <QStyleOption>
 
 #include "Config.h"
 #include "FlatButton.h"
@@ -43,3 +44,12 @@ LeaveRoomDialog::LeaveRoomDialog(QWidget *parent)
         connect(confirmBtn_, &QPushButton::clicked, [=]() { emit closing(true); });
         connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false); });
 }
+
+void
+LeaveRoomDialog::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
diff --git a/src/LoginPage.cc b/src/LoginPage.cc
index 5c766b78..c4923c7d 100644
--- a/src/LoginPage.cc
+++ b/src/LoginPage.cc
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QStyleOption>
+
 #include "LoginPage.h"
 #include "Config.h"
 #include "FlatButton.h"
@@ -301,4 +303,13 @@ LoginPage::onBackButtonClicked()
         emit backButtonClicked();
 }
 
+void
+LoginPage::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
+
 LoginPage::~LoginPage() {}
diff --git a/src/LogoutDialog.cc b/src/LogoutDialog.cc
index c0db1270..8be6e166 100644
--- a/src/LogoutDialog.cc
+++ b/src/LogoutDialog.cc
@@ -17,6 +17,8 @@
 
 #include <QLabel>
 #include <QVBoxLayout>
+#include <QPaintEvent>
+#include <QStyleOption>
 
 #include "Config.h"
 #include "FlatButton.h"
@@ -27,7 +29,6 @@ LogoutDialog::LogoutDialog(QWidget *parent)
   : QFrame(parent)
 {
         setMaximumSize(400, 400);
-        //        setStyleSheet("background-color: #fff");
 
         auto layout = new QVBoxLayout(this);
         layout->setSpacing(30);
@@ -52,7 +53,6 @@ LogoutDialog::LogoutDialog(QWidget *parent)
 
         auto label = new QLabel(tr("Logout. Are you sure?"), this);
         label->setFont(font);
-        //        label->setStyleSheet("color: #333333");
 
         layout->addWidget(label);
         layout->addLayout(buttonLayout);
@@ -60,3 +60,12 @@ LogoutDialog::LogoutDialog(QWidget *parent)
         connect(confirmBtn_, &QPushButton::clicked, [=]() { emit closing(true); });
         connect(cancelBtn_, &QPushButton::clicked, [=]() { emit closing(false); });
 }
+
+void
+LogoutDialog::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc
index 01f3b28f..52a0ac02 100644
--- a/src/RegisterPage.cc
+++ b/src/RegisterPage.cc
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QStyleOption>
+
 #include "RegisterPage.h"
 #include "Avatar.h"
 #include "Config.h"
@@ -186,4 +188,13 @@ RegisterPage::onRegisterButtonClicked()
         }
 }
 
+void
+RegisterPage::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
+
 RegisterPage::~RegisterPage() {}
diff --git a/src/UserSettingsPage.cc b/src/UserSettingsPage.cc
index e53ad668..997f3eef 100644
--- a/src/UserSettingsPage.cc
+++ b/src/UserSettingsPage.cc
@@ -152,3 +152,12 @@ UserSettingsPage::resizeEvent(QResizeEvent *event)
 
         QWidget::resizeEvent(event);
 }
+
+void
+UserSettingsPage::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}
diff --git a/src/WelcomePage.cc b/src/WelcomePage.cc
index f361ca05..e1c74d3e 100644
--- a/src/WelcomePage.cc
+++ b/src/WelcomePage.cc
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QStyleOption>
 #include <QLabel>
 #include <QLayout>
 
@@ -83,3 +84,12 @@ WelcomePage::WelcomePage(QWidget *parent)
         connect(registerBtn_, &QPushButton::clicked, this, &WelcomePage::userRegister);
         connect(loginBtn_, &QPushButton::clicked, this, &WelcomePage::userLogin);
 }
+
+void
+WelcomePage::paintEvent(QPaintEvent *)
+{
+        QStyleOption opt;
+        opt.init(this);
+        QPainter p(this);
+        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+}