Adjust the font sizes of the welcome page

2 files changed, 29 insertions, 48 deletions

diff --git a/src/WelcomePage.cpp b/src/WelcomePage.cpp

index 0560222e..8c3f6487 100644
--- a/src/WelcomePage.cpp
+++ b/src/WelcomePage.cpp
@@ -22,17 +22,19 @@
 #include "Config.h"
 #include "WelcomePage.h"
 #include "ui/RaisedButton.h"
+#include "ui/TextLabel.h"
 
 WelcomePage::WelcomePage(QWidget *parent)
   : QWidget(parent)
 {
-        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
         auto topLayout_ = new QVBoxLayout(this);
         topLayout_->setSpacing(20);
+        topLayout_->setAlignment(Qt::AlignCenter);
 
-        QFont headingFont("Open Sans", 20);
-        QFont subTitleFont("Open Sans", 19);
+        QFont headingFont;
+        headingFont.setPointSizeF(headingFont.pointSizeF() * 2);
+        QFont subTitleFont;
+        subTitleFont.setPointSizeF(subTitleFont.pointSizeF() * 1.5);
 
         QIcon icon;
         icon.addFile(":/logos/splash.png");
@@ -44,45 +46,47 @@ WelcomePage::WelcomePage(QWidget *parent)
         QString heading(tr("Welcome to nheko! The desktop client for the Matrix protocol."));
         QString main(tr("Enjoy your stay!"));
 
-        auto intoTxt_ = new QLabel(heading, this);
+        auto intoTxt_ = new TextLabel(heading, this);
         intoTxt_->setFont(headingFont);
-        intoTxt_->setContentsMargins(0, 20, 0, 0);
+        intoTxt_->setAlignment(Qt::AlignCenter);
 
-        auto subTitle = new QLabel(main, this);
+        auto subTitle = new TextLabel(main, this);
         subTitle->setFont(subTitleFont);
-        subTitle->setContentsMargins(0, 0, 0, 0);
+        subTitle->setAlignment(Qt::AlignCenter);
 
         topLayout_->addStretch(1);
         topLayout_->addWidget(logo_);
-        topLayout_->addWidget(intoTxt_, 0, Qt::AlignCenter);
-        topLayout_->addWidget(subTitle, 0, Qt::AlignCenter);
+        topLayout_->addWidget(intoTxt_);
+        topLayout_->addWidget(subTitle);
 
         auto btnLayout_ = new QHBoxLayout();
         btnLayout_->setSpacing(20);
         btnLayout_->setContentsMargins(0, 20, 0, 20);
 
-        registerBtn_ = new RaisedButton(tr("REGISTER"), this);
-        registerBtn_->setBackgroundColor(QColor("#333333"));
-        registerBtn_->setMinimumSize(240, 65);
-        registerBtn_->setFontSize(conf::btn::fontSize);
-        registerBtn_->setCornerRadius(conf::btn::cornerRadius);
+        const int fontHeight   = QFontMetrics{subTitleFont}.height();
+        const int buttonHeight = fontHeight * 2.5;
+        const int buttonWidth  = fontHeight * 8;
+
+        auto registerBtn = new RaisedButton(tr("REGISTER"), this);
+        registerBtn->setMinimumSize(buttonWidth, buttonHeight);
+        registerBtn->setFontSize(subTitleFont.pointSizeF());
+        registerBtn->setCornerRadius(conf::btn::cornerRadius);
 
-        loginBtn_ = new RaisedButton(tr("LOGIN"), this);
-        loginBtn_->setBackgroundColor(QColor("#333333"));
-        loginBtn_->setMinimumSize(240, 65);
-        loginBtn_->setFontSize(conf::btn::fontSize);
-        loginBtn_->setCornerRadius(conf::btn::cornerRadius);
+        auto loginBtn = new RaisedButton(tr("LOGIN"), this);
+        loginBtn->setMinimumSize(buttonWidth, buttonHeight);
+        loginBtn->setFontSize(subTitleFont.pointSizeF());
+        loginBtn->setCornerRadius(conf::btn::cornerRadius);
 
         btnLayout_->addStretch(1);
-        btnLayout_->addWidget(registerBtn_);
-        btnLayout_->addWidget(loginBtn_);
+        btnLayout_->addWidget(registerBtn);
+        btnLayout_->addWidget(loginBtn);
         btnLayout_->addStretch(1);
 
         topLayout_->addLayout(btnLayout_);
         topLayout_->addStretch(1);
 
-        connect(registerBtn_, &QPushButton::clicked, this, &WelcomePage::userRegister);
-        connect(loginBtn_, &QPushButton::clicked, this, &WelcomePage::userLogin);
+        connect(registerBtn, &QPushButton::clicked, this, &WelcomePage::userRegister);
+        connect(loginBtn, &QPushButton::clicked, this, &WelcomePage::userLogin);
 }
 
 void
diff --git a/src/WelcomePage.h b/src/WelcomePage.h

index b33ca669..480dc702 100644
--- a/src/WelcomePage.h
+++ b/src/WelcomePage.h
@@ -1,26 +1,7 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 #pragma once
 
 #include <QWidget>
 
-class RaisedButton;
-
 class WelcomePage : public QWidget
 {
         Q_OBJECT
@@ -29,7 +10,7 @@ public:
         explicit WelcomePage(QWidget *parent = 0);
 
 protected:
-        void paintEvent(QPaintEvent *event) override;
+        void paintEvent(QPaintEvent *) override;
 
 signals:
         // Notify that the user wants to login in.
@@ -37,8 +18,4 @@ signals:
 
         // Notify that the user wants to register.
         void userRegister();
-
-private:
-        RaisedButton *registerBtn_;
-        RaisedButton *loginBtn_;
 };