CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shared_widget: Force min width of 100 for restore button 

Dark theme mandates a 100px minimum width for QAbstractButton, even
though this is not desired here.
master
lat9nq 2023-05-18 23:19:08 +07:00
parent 3d932416e3
commit b570b719de
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/yuzu/configuration/shared_widget.cpp
Unescape Escape View File

@ -18,6 +18,7 @@
#include <qboxlayout.h> #include <qboxlayout.h>
#include <qnamespace.h> #include <qnamespace.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qsizepolicy.h>
#include <qvalidator.h> #include <qvalidator.h>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/settings.h" #include "common/settings.h"
@ -27,11 +28,20 @@
namespace ConfigurationShared { namespace ConfigurationShared {
static int restore_button_count = 0;
QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* parent) { QPushButton* Widget::CreateRestoreGlobalButton(bool using_global, QWidget* parent) {
restore_button_count++;
QStyle* style = parent->style(); QStyle* style = parent->style();
QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_LineEditClearButton)); QIcon* icon = new QIcon(style->standardIcon(QStyle::SP_LineEditClearButton));
QPushButton* restore_button = new QPushButton(*icon, QStringLiteral(""), parent); 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(); QSizePolicy sp_retain = restore_button->sizePolicy();
sp_retain.setRetainSizeWhenHidden(true); sp_retain.setRetainSizeWhenHidden(true);
@ -113,8 +123,9 @@ void Widget::CreateCombobox(const QString& label, std::function<void()>& load_fu
QLayout* layout = new QHBoxLayout(this); QLayout* layout = new QHBoxLayout(this);
QLabel* qt_label = new QLabel(label, this); QLabel* qt_label = CreateLabel(label);
combobox = new QComboBox(this); combobox = new QComboBox(this);
combobox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
layout->addWidget(qt_label); layout->addWidget(qt_label);
layout->addWidget(combobox); layout->addWidget(combobox);