summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlat9nq <22451773+lat9nq@users.noreply.github.com>2023-05-19 08:19:08 +0200
committerlat9nq <22451773+lat9nq@users.noreply.github.com>2023-07-21 16:56:07 +0200
commitb570b719de11512ab2acc2c1fd8a8a9ae8391763 (patch)
treedd654531817a2138bf20c6154951200606f606dc /src
parentconfiguration: Workaround for Windows Qt bug (diff)
downloadyuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.tar
yuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.tar.gz
yuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.tar.bz2
yuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.tar.lz
yuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.tar.xz
yuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.tar.zst
yuzu-b570b719de11512ab2acc2c1fd8a8a9ae8391763.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/shared_widget.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp
index 71f4eadbe..d5b2bd60e 100644
--- a/src/yuzu/configuration/shared_widget.cpp
+++ b/src/yuzu/configuration/shared_widget.cpp
@@ -18,6 +18,7 @@
#include <qboxlayout.h>
#include <qnamespace.h>
#include <qpushbutton.h>
+#include <qsizepolicy.h>
#include <qvalidator.h>
#include "common/common_types.h"
#include "common/settings.h"
@@ -27,11 +28,20 @@
namespace ConfigurationShared {
+static int restore_button_count = 0;
+
QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* parent) {
+ restore_button_count++;
+
QStyle* style = parent->style();
QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_LineEditClearButton));
QPushButton* restore_button = new QPushButton(*icon, QStringLiteral(""), parent);
- restore_button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+ restore_button->setObjectName(QStringLiteral("RestoreButton%1").arg(restore_button_count));
+ restore_button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+
+ // Workaround for dark theme causing min-width to be much larger than 0
+ restore_button->setStyleSheet(
+ QStringLiteral("QAbstractButton#%1 { min-width: 0px }").arg(restore_button->objectName()));
QSizePolicy sp_retain = restore_button->sizePolicy();
sp_retain.setRetainSizeWhenHidden(true);
@@ -113,8 +123,9 @@ void Widget::CreateCombobox(const QString& label, std::function<void()>& load_fu
QLayout* layout = new QHBoxLayout(this);
- QLabel* qt_label = new QLabel(label, this);
+ QLabel* qt_label = CreateLabel(label);
combobox = new QComboBox(this);
+ combobox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
layout->addWidget(qt_label);
layout->addWidget(combobox);