Remove pixel values from modals, use pointSize instead
This commit is contained in:
parent
24bad93f6b
commit
3d2e29bfa0
12 changed files with 154 additions and 99 deletions
|
|
@ -14,41 +14,51 @@ using namespace dialogs;
|
|||
JoinRoom::JoinRoom(QWidget *parent)
|
||||
: QFrame(parent)
|
||||
{
|
||||
setMaximumSize(400, 400);
|
||||
setMinimumWidth(conf::modals::MIN_WIDGET_WIDTH);
|
||||
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
|
||||
auto layout = new QVBoxLayout(this);
|
||||
layout->setSpacing(30);
|
||||
layout->setMargin(20);
|
||||
layout->setSpacing(conf::modals::WIDGET_SPACING);
|
||||
layout->setMargin(conf::modals::WIDGET_MARGIN);
|
||||
|
||||
auto buttonLayout = new QHBoxLayout();
|
||||
buttonLayout->setSpacing(0);
|
||||
buttonLayout->setMargin(0);
|
||||
|
||||
QFont buttonFont;
|
||||
buttonFont.setPointSizeF(buttonFont.pointSizeF() * conf::modals::BUTTON_TEXT_SIZE_RATIO);
|
||||
|
||||
confirmBtn_ = new FlatButton("JOIN", this);
|
||||
confirmBtn_->setFontSize(conf::btn::fontSize);
|
||||
confirmBtn_->setFont(buttonFont);
|
||||
|
||||
cancelBtn_ = new FlatButton(tr("CANCEL"), this);
|
||||
cancelBtn_->setFontSize(conf::btn::fontSize);
|
||||
cancelBtn_->setFont(buttonFont);
|
||||
|
||||
buttonLayout->addStretch(1);
|
||||
buttonLayout->addWidget(confirmBtn_);
|
||||
buttonLayout->addWidget(cancelBtn_);
|
||||
|
||||
QFont font;
|
||||
font.setPixelSize(conf::headerFontSize);
|
||||
|
||||
roomInput_ = new TextField(this);
|
||||
roomInput_->setLabel(tr("Room ID or alias"));
|
||||
|
||||
layout->addWidget(roomInput_);
|
||||
layout->addLayout(buttonLayout);
|
||||
layout->addStretch(1);
|
||||
|
||||
connect(roomInput_, &QLineEdit::returnPressed, this, &JoinRoom::handleInput);
|
||||
connect(confirmBtn_, &QPushButton::clicked, this, &JoinRoom::handleInput);
|
||||
connect(cancelBtn_, &QPushButton::clicked, [this]() { emit closing(false, ""); });
|
||||
}
|
||||
|
||||
void
|
||||
JoinRoom::handleInput()
|
||||
{
|
||||
if (roomInput_->text().isEmpty())
|
||||
return;
|
||||
|
||||
// TODO: input validation with error messages.
|
||||
connect(confirmBtn_, &QPushButton::clicked, [this]() {
|
||||
emit closing(true, roomInput_->text());
|
||||
roomInput_->clear();
|
||||
});
|
||||
connect(cancelBtn_, &QPushButton::clicked, [this]() { emit closing(false, ""); });
|
||||
emit closing(true, roomInput_->text());
|
||||
roomInput_->clear();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue