d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed error_label_ below login button, now it's calculating height and uses correct word wrapping

Browse source
This commit is contained in:
kirillpt 2020-11-25 01:42:35 +03:00
parent 3047f1a89f
commit daf8531e3f
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/LoginPage.cpp
View file

@ -16,9 +16,11 @@
*/ */
#include <QDesktopServices> #include <QDesktopServices>
#include <QFontMetrics>
#include <QLabel> #include <QLabel>
#include <QPainter> #include <QPainter>
#include <QStyleOption> #include <QStyleOption>
#include <QtMath>
#include <mtx/identifiers.hpp> #include <mtx/identifiers.hpp>
#include <mtx/requests.hpp> #include <mtx/requests.hpp>
@ -160,8 +162,7 @@ LoginPage::LoginPage(QWidget *parent)
error_label_->setFont(font); error_label_->setFont(font);
error_label_->setWordWrap(true); error_label_->setWordWrap(true);
// FIXME: Moving this below the login button breaks word wrapping error_font_metrics_ = new QFontMetrics(font);
form_layout_->addWidget(error_label_, 0, Qt::AlignHCenter);
top_layout_->addLayout(top_bar_layout_); top_layout_->addLayout(top_bar_layout_);
top_layout_->addStretch(1); top_layout_->addStretch(1);
@ -169,6 +170,7 @@ LoginPage::LoginPage(QWidget *parent)
top_layout_->addLayout(form_wrapper_); top_layout_->addLayout(form_wrapper_);
top_layout_->addStretch(1); top_layout_->addStretch(1);
top_layout_->addLayout(button_layout_); top_layout_->addLayout(button_layout_);
top_layout_->addWidget(error_label_, 0, Qt::AlignHCenter);
top_layout_->addStretch(1); top_layout_->addStretch(1);
setLayout(top_layout_); setLayout(top_layout_);
@ -190,6 +192,9 @@ LoginPage::LoginPage(QWidget *parent)
void void
LoginPage::loginError(const QString &msg) LoginPage::loginError(const QString &msg)
{ {
int width = error_font_metrics_->boundingRect(msg).width();
int height = error_font_metrics_->boundingRect(msg).height();
error_label_->setFixedHeight(qCeil(width / 200 * height));
error_label_->setText(msg); error_label_->setText(msg);
} }
@ -229,7 +234,8 @@ LoginPage::onMatrixIdEntered()
try { try {
user = parse<User>(matrixid_input_->text().toStdString()); user = parse<User>(matrixid_input_->text().toStdString());
} catch (const std::exception &e) { } catch (const std::exception &e) {
return loginError("You have entered an invalid Matrix ID e.g @joe:matrix.org"); matrixIdError("You have entered an invalid Matrix ID e.g @joe:matrix.org");
return;
} }
QString homeServer = QString::fromStdString(user.hostname()); QString homeServer = QString::fromStdString(user.hostname());
@ -340,7 +346,7 @@ LoginPage::onServerAddressEntered()
void void
LoginPage::versionError(const QString &error) LoginPage::versionError(const QString &error)
{ {
error_label_->setText(error); loginError(error);
serverInput_->show(); serverInput_->show();
spinner_->stop(); spinner_->stop();
@ -390,7 +396,8 @@ LoginPage::onLoginButtonClicked()
try { try {
user = parse<User>(matrixid_input_->text().toStdString()); user = parse<User>(matrixid_input_->text().toStdString());
} catch (const std::exception &e) { } catch (const std::exception &e) {
return loginError("You have entered an invalid Matrix ID e.g @joe:matrix.org"); matrixIdError("You have entered an invalid Matrix ID e.g @joe:matrix.org");
return;
} }
if (loginMethod == LoginMethod::Password) { if (loginMethod == LoginMethod::Password) {

2
src/LoginPage.h
View file

@ -115,6 +115,8 @@ private:
QLabel *error_label_; QLabel *error_label_;
QLabel *error_matrixid_label_; QLabel *error_matrixid_label_;
QFontMetrics *error_font_metrics_;
QHBoxLayout *serverLayout_; QHBoxLayout *serverLayout_;
QHBoxLayout *matrixidLayout_; QHBoxLayout *matrixidLayout_;
LoadingIndicator *spinner_; LoadingIndicator *spinner_;