diff --git a/src/citra_qt/configuration/configure_enhancements.cpp b/src/citra_qt/configuration/configure_enhancements.cpp index c322def82..cd4d9efa3 100644 --- a/src/citra_qt/configuration/configure_enhancements.cpp +++ b/src/citra_qt/configuration/configure_enhancements.cpp @@ -22,7 +22,8 @@ ConfigureEnhancements::ConfigureEnhancements(QWidget* parent) const bool res_scale_enabled = graphics_api != Settings::GraphicsAPI::Software; ui->resolution_factor_combobox->setEnabled(res_scale_enabled); - ui->custom_layout_group->setEnabled((Settings::values.layout_option.GetValue() == Settings::LayoutOption::CustomLayout)); + ui->custom_layout_group->setEnabled( + (Settings::values.layout_option.GetValue() == Settings::LayoutOption::CustomLayout)); connect(ui->layout_combobox, static_cast(&QComboBox::currentIndexChanged), this, [this](int currentIndex) { @@ -97,7 +98,8 @@ void ConfigureEnhancements::SetConfiguration() { ui->custom_bottom_top->setValue(Settings::values.custom_bottom_top.GetValue()); ui->custom_bottom_right->setValue(Settings::values.custom_bottom_right.GetValue()); ui->custom_bottom_bottom->setValue(Settings::values.custom_bottom_bottom.GetValue()); - ui->custom_second_layer_opacity->setValue(Settings::values.custom_second_layer_opacity.GetValue()); + ui->custom_second_layer_opacity->setValue( + Settings::values.custom_second_layer_opacity.GetValue()); ui->toggle_dump_textures->setChecked(Settings::values.dump_textures.GetValue()); ui->toggle_custom_textures->setChecked(Settings::values.custom_textures.GetValue()); ui->toggle_preload_textures->setChecked(Settings::values.preload_textures.GetValue()); diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 074d7ce93..8684de1e9 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -2662,7 +2662,7 @@ void GMainWindow::SyncMenuUISettings() { ui->action_Screen_Layout_Separate_Windows->setChecked( Settings::values.layout_option.GetValue() == Settings::LayoutOption::SeparateWindows); ui->action_Screen_Layout_Custom_Layout->setChecked(Settings::values.layout_option.GetValue() == - Settings::LayoutOption::CustomLayout); + Settings::LayoutOption::CustomLayout); ui->action_Screen_Layout_Swap_Screens->setChecked(Settings::values.swap_screen.GetValue()); ui->action_Screen_Layout_Upright_Screens->setChecked( Settings::values.upright_screen.GetValue()); diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index a36fb25d6..b3c553a53 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -947,7 +947,7 @@ void RendererOpenGL::DrawScreens(const Layout::FramebufferLayout& layout, bool f void RendererOpenGL::ApplySecondLayerOpacity() { if ((Settings::values.layout_option.GetValue() == Settings::LayoutOption::CustomLayout || - Settings::values.custom_layout) && + Settings::values.custom_layout) && Settings::values.custom_second_layer_opacity.GetValue() < 100) { state.blend.src_rgb_func = GL_CONSTANT_ALPHA; state.blend.src_a_func = GL_CONSTANT_ALPHA; @@ -959,7 +959,7 @@ void RendererOpenGL::ApplySecondLayerOpacity() { void RendererOpenGL::ResetSecondLayerOpacity() { if ((Settings::values.layout_option.GetValue() == Settings::LayoutOption::CustomLayout || - Settings::values.custom_layout) && + Settings::values.custom_layout) && Settings::values.custom_second_layer_opacity.GetValue() < 100) { state.blend.src_rgb_func = GL_ONE; state.blend.dst_rgb_func = GL_ZERO;