From 14e41dc0c17e3ccbb348d6ff920ec991d0bb9f50 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 28 Jun 2017 08:59:35 -0700 Subject: [PATCH] UI: Make sure "Defaults" buttons aren't default buttons --- UI/window-basic-filters.cpp | 5 +++-- UI/window-basic-properties.cpp | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp index 1f017ddfa..fece04e02 100644 --- a/UI/window-basic-filters.cpp +++ b/UI/window-basic-filters.cpp @@ -87,8 +87,9 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_) SLOT(EffectFilterNameEdited(QWidget*, QAbstractItemDelegate::EndEditHint))); - connect(ui->buttonBox->button(QDialogButtonBox::Close), - SIGNAL(clicked()), this, SLOT(close())); + QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close); + connect(close, SIGNAL(clicked()), this, SLOT(close())); + close->setDefault(true); ui->buttonBox->button(QDialogButtonBox::Reset)->setText( QTStr("Defaults")); diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp index dc35c1fc7..3f7fb3aea 100644 --- a/UI/window-basic-properties.cpp +++ b/UI/window-basic-properties.cpp @@ -49,11 +49,14 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_) int cy = (int)config_get_int(App()->GlobalConfig(), "PropertiesWindow", "cy"); - buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole); + QPushButton *b; + b = buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole); buttonBox->addButton(QTStr("Cancel"), QDialogButtonBox::RejectRole); buttonBox->addButton(QTStr("Defaults"), QDialogButtonBox::ResetRole); buttonBox->setObjectName(QStringLiteral("buttonBox")); + b->setDefault(true); + if (cx > 400 && cy > 400) resize(cx, cy); else