prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address my own review

Browse Source 
Basically revert unintended changes
This commit is contained in:
lat9nq
2020-06-28 16:35:23 -04:00
parent fabb0b8c3d
commit 513356d21b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/yuzu/configuration/configure_graphics.cpp
View File

@@ -36,6 +36,14 @@ ConfigureGraphics::ConfigureGraphics(QWidget* parent)
connect(ui->device, qOverload<int>(&QComboBox::activated), this, connect(ui->device, qOverload<int>(&QComboBox::activated), this,
[this](int device) { UpdateDeviceSelection(device); }); [this](int device) { UpdateDeviceSelection(device); });
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
const QColor new_bg_color = QColorDialog::getColor(bg_color);
if (!new_bg_color.isValid()) {
return;
}
UpdateBackgroundColorButton(new_bg_color);
});
ui->bg_label->setVisible(Settings::configuring_global); ui->bg_label->setVisible(Settings::configuring_global);
ui->bg_combobox->setVisible(!Settings::configuring_global); ui->bg_combobox->setVisible(!Settings::configuring_global);
} }
@@ -224,14 +232,6 @@ void ConfigureGraphics::SetupPerGameUI() {
connect(ui->bg_combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this, connect(ui->bg_combobox, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), this,
[this](int index) { ui->bg_button->setEnabled(index == 1); }); [this](int index) { ui->bg_button->setEnabled(index == 1); });
connect(ui->bg_button, &QPushButton::clicked, this, [this] {
const QColor new_bg_color = QColorDialog::getColor(bg_color);
if (!new_bg_color.isValid()) {
return;
}
UpdateBackgroundColorButton(new_bg_color);
});
ui->use_disk_shader_cache->setTristate(true); ui->use_disk_shader_cache->setTristate(true);
ui->use_asynchronous_gpu_emulation->setTristate(true); ui->use_asynchronous_gpu_emulation->setTristate(true);
ConfigurationShared::InsertGlobalItem(ui->aspect_ratio_combobox); ConfigurationShared::InsertGlobalItem(ui->aspect_ratio_combobox);

2
src/yuzu/main.cpp
View File

@@ -543,7 +543,6 @@ void GMainWindow::InitializeWidgets() {
async_status_button->setText(tr("ASYNC")); async_status_button->setText(tr("ASYNC"));
async_status_button->setCheckable(true); async_status_button->setCheckable(true);
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation); async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
statusBar()->insertPermanentWidget(0, async_status_button);
// Setup Multicore button // Setup Multicore button
multicore_status_button = new QPushButton(); multicore_status_button = new QPushButton();
@@ -565,6 +564,7 @@ void GMainWindow::InitializeWidgets() {
multicore_status_button->setCheckable(true); multicore_status_button->setCheckable(true);
multicore_status_button->setChecked(Settings::values.use_multi_core); multicore_status_button->setChecked(Settings::values.use_multi_core);
statusBar()->insertPermanentWidget(0, multicore_status_button); statusBar()->insertPermanentWidget(0, multicore_status_button);
statusBar()->insertPermanentWidget(0, async_status_button);
// Setup Renderer API button // Setup Renderer API button
renderer_status_button = new QPushButton(); renderer_status_button = new QPushButton();