Merge pull request #13665 from jordan-woyak/dark-mode-filter

DolphinQt: Replace widespread SetQWidgetWindowDecorations calls with an event filter.
2025-07-23 06:09:50 -06:00 · 2025-06-07 18:19:13 -05:00
parent 65f3ba70f5 5906512847
commit 1786e34bd3
47 changed files with 77 additions and 163 deletions
--- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp
+++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp
@ -23,7 +23,6 @@
 #include "DolphinQt/Config/CheatWarningWidget.h"
 #include "DolphinQt/Config/HardcoreWarningWidget.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"

 ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_required)
    : m_game_id(std::move(game_id)), m_game_revision(game_revision),
@ -257,7 +256,6 @@ void ARCodeWidget::OnCodeAddClicked()
  ar.enabled = true;

  m_cheat_code_editor->SetARCode(&ar);
-  SetQWidgetWindowDecorations(m_cheat_code_editor);
  if (m_cheat_code_editor->exec() == QDialog::Rejected)
    return;

@ -275,7 +273,6 @@ void ARCodeWidget::OnCodeEditClicked()

  const auto* const selected = items[0];
  auto& current_ar = m_ar_codes[m_code_list->row(selected)];
-  SetQWidgetWindowDecorations(m_cheat_code_editor);

  if (current_ar.user_defined)
  {
--- a/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp
@ -13,7 +13,6 @@

 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"

@ -60,7 +59,6 @@ void CommonControllersWidget::OnControllerInterfaceConfigure()
  ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
  window->setAttribute(Qt::WA_DeleteOnClose, true);
  window->setWindowModality(Qt::WindowModality::WindowModal);
-  SetQWidgetWindowDecorations(window);
  window->show();
 }

--- a/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp
+++ b/Source/Core/DolphinQt/Config/ControllerInterface/DualShockUDPClientWidget.cpp
@ -14,7 +14,6 @@
 #include "Common/Config/Config.h"
 #include "DolphinQt/Config/ControllerInterface/DualShockUDPClientAddServerDialog.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h"

 DualShockUDPClientWidget::DualShockUDPClientWidget()
@ -112,7 +111,6 @@ void DualShockUDPClientWidget::OnServerAdded()
  DualShockUDPClientAddServerDialog add_server_dialog(this);
  connect(&add_server_dialog, &DualShockUDPClientAddServerDialog::accepted, this,
          &DualShockUDPClientWidget::RefreshServerList);
-  SetQWidgetWindowDecorations(&add_server_dialog);
  add_server_dialog.exec();
 }

--- a/Source/Core/DolphinQt/Config/FilesystemWidget.cpp
+++ b/Source/Core/DolphinQt/Config/FilesystemWidget.cpp
@ -25,7 +25,6 @@
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Resources.h"

 #include "UICommon/UICommon.h"
@ -367,7 +366,6 @@ void FilesystemWidget::ExtractDirectory(const DiscIO::Partition& partition, cons
    dialog.Reset();
  });

-  SetQWidgetWindowDecorations(dialog.GetRaw());
  dialog.GetRaw()->exec();
  future.get();
 }
--- a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp
+++ b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp
@ -19,7 +19,6 @@
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"

 FreeLookWidget::FreeLookWidget(QWidget* parent) : QWidget(parent)
@ -104,7 +103,6 @@ void FreeLookWidget::OnFreeLookControllerConfigured()
  MappingWindow* window = new MappingWindow(this, MappingWindow::Type::MAPPING_FREELOOK, index);
  window->setAttribute(Qt::WA_DeleteOnClose, true);
  window->setWindowModality(Qt::WindowModality::WindowModal);
-  SetQWidgetWindowDecorations(window);
  window->show();
 }

--- a/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp
@ -24,7 +24,6 @@
 #include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"

@ -140,7 +139,6 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
  case SerialInterface::SIDEVICE_WIIU_ADAPTER:
  {
    GCPadWiiUConfigDialog dialog(static_cast<int>(index), this);
-    SetQWidgetWindowDecorations(&dialog);
    dialog.exec();
    return;
  }
@ -166,7 +164,6 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
  MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
  window->setAttribute(Qt::WA_DeleteOnClose, true);
  window->setWindowModality(Qt::WindowModality::WindowModal);
-  SetQWidgetWindowDecorations(window);
  window->show();
 }

--- a/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
+++ b/Source/Core/DolphinQt/Config/GeckoCodeWidget.cpp
@ -30,7 +30,6 @@
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/WrapInScrollArea.h"

 GeckoCodeWidget::GeckoCodeWidget(std::string game_id, std::string gametdb_id, u16 game_revision,
@ -210,7 +209,6 @@ void GeckoCodeWidget::AddCode()
  code.enabled = true;

  m_cheat_code_editor->SetGeckoCode(&code);
-  SetQWidgetWindowDecorations(m_cheat_code_editor);
  if (m_cheat_code_editor->exec() == QDialog::Rejected)
    return;

@ -228,7 +226,6 @@ void GeckoCodeWidget::EditCode()
  const int index = item->data(Qt::UserRole).toInt();

  m_cheat_code_editor->SetGeckoCode(&m_gecko_codes[index]);
-  SetQWidgetWindowDecorations(m_cheat_code_editor);
  if (m_cheat_code_editor->exec() == QDialog::Rejected)
    return;

--- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
@ -25,7 +25,6 @@
 #include "DolphinQt/Config/Graphics/PostProcessingConfigWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipPushButton.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"

 #include "VideoCommon/PostProcessing.h"
@ -629,7 +628,6 @@ void EnhancementsWidget::AddDescriptions()
 void EnhancementsWidget::ConfigureColorCorrection()
 {
  ColorCorrectionConfigWindow dialog(this);
-  SetQWidgetWindowDecorations(&dialog);
  dialog.exec();
 }

@ -637,6 +635,5 @@ void EnhancementsWidget::ConfigurePostProcessingShader()
 {
  const std::string shader = ReadSetting(Config::GFX_ENHANCE_POST_SHADER);
  PostProcessingConfigWindow dialog(this, shader);
-  SetQWidgetWindowDecorations(&dialog);
  dialog.exec();
 }
--- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
@ -27,7 +27,6 @@
 #include "DolphinQt/Config/Graphics/GraphicsWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipComboBox.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"

 #include "VideoCommon/VideoBackendBase.h"
@ -199,7 +198,6 @@ void GeneralWidget::BackendWarning()
      confirm_sw.setWindowTitle(tr("Confirm backend change"));
      confirm_sw.setText(tr(warningMessage->c_str()));

-      SetQWidgetWindowDecorations(&confirm_sw);
      if (confirm_sw.exec() != QMessageBox::Yes)
      {
        m_backend_combo->setCurrentIndex(m_previous_backend);
--- a/Source/Core/DolphinQt/Config/Mapping/FreeLookRotation.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/FreeLookRotation.cpp
@ -11,7 +11,6 @@

 #include "Core/FreeLookManager.h"
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "InputCommon/InputConfig.h"

 FreeLookRotation::FreeLookRotation(MappingWindow* window) : MappingWidget(window)
@ -34,7 +33,6 @@ void FreeLookRotation::CreateMainLayout()
    ControllerInterfaceWindow* window = new ControllerInterfaceWindow(this);
    window->setAttribute(Qt::WA_DeleteOnClose, true);
    window->setWindowModality(Qt::WindowModality::WindowModal);
-    SetQWidgetWindowDecorations(window);
    window->show();
  });
  m_main_layout->addLayout(alternate_input_layout, 0, 0, 1, -1);
--- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
@ -28,7 +28,6 @@
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/QtUtils/BlockUserInputFilter.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"

 #include "InputCommon/ControlReference/ControlReference.h"
@ -259,8 +258,6 @@ IOWindow::IOWindow(MappingWindow* window, ControllerEmu::EmulatedController* con
    : QDialog(window), m_reference(ref), m_original_expression(ref->GetExpression()),
      m_controller(controller), m_type(type)
 {
-  SetQWidgetWindowDecorations(this);
-
  CreateMainLayout();

  connect(window, &MappingWindow::Update, this, &IOWindow::Update);
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWidget.cpp
@ -18,7 +18,6 @@
 #include "DolphinQt/Config/Mapping/MappingIndicator.h"
 #include "DolphinQt/Config/Mapping/MappingNumeric.h"
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"

 #include "InputCommon/ControllerEmu/Control/Control.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
@ -282,7 +281,6 @@ void MappingWidget::ShowAdvancedControlGroupDialog(ControllerEmu::ControlGroup*
  // Enable "Close" button functionality.
  connect(button_box, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);

-  SetQWidgetWindowDecorations(&dialog);
  dialog.exec();
 }

--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@ -51,7 +51,6 @@
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/WindowActivationEventFilter.h"
 #include "DolphinQt/QtUtils/WrapInScrollArea.h"
 #include "DolphinQt/Settings.h"
@ -271,7 +270,6 @@ void MappingWindow::OnDeleteProfilePressed()
    error.setIcon(QMessageBox::Critical);
    error.setWindowTitle(tr("Error"));
    error.setText(tr("The profile '%1' does not exist").arg(profile_name));
-    SetQWidgetWindowDecorations(&error);
    error.exec();
    return;
  }
@ -284,7 +282,6 @@ void MappingWindow::OnDeleteProfilePressed()
  confirm.setInformativeText(tr("This cannot be undone!"));
  confirm.setStandardButtons(QMessageBox::Yes | QMessageBox::Cancel);

-  SetQWidgetWindowDecorations(&confirm);
  if (confirm.exec() != QMessageBox::Yes)
  {
    return;
@ -312,7 +309,6 @@ void MappingWindow::OnLoadProfilePressed()
    error.setIcon(QMessageBox::Critical);
    error.setWindowTitle(tr("Error"));
    error.setText(tr("The profile '%1' does not exist").arg(m_profiles_combo->currentText()));
-    SetQWidgetWindowDecorations(&error);
    error.exec();
    return;
  }
--- a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.cpp
@ -15,7 +15,6 @@

 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"

 #include "InputCommon/InputConfig.h"

@ -43,7 +42,6 @@ void WiimoteEmuExtensionMotionInput::CreateNunchukLayout()
  warning_layout->addWidget(warning_input_sources_button);
  connect(warning_input_sources_button, &QPushButton::clicked, this, [this] {
    ControllerInterfaceWindow window{this};
-    SetQWidgetWindowDecorations(&window);
    window.exec();
  });
  layout->addLayout(warning_layout, 0, 0, 1, -1);
--- a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControlIMU.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuMotionControlIMU.cpp
@ -16,7 +16,6 @@

 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/QtUtils.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"

 #include "InputCommon/InputConfig.h"

@ -41,7 +40,6 @@ void WiimoteEmuMotionControlIMU::CreateMainLayout()
  warning_layout->addWidget(warning_input_sources_button);
  connect(warning_input_sources_button, &QPushButton::clicked, this, [this] {
    ControllerInterfaceWindow window{this};
-    SetQWidgetWindowDecorations(&window);
    window.exec();
  });

--- a/Source/Core/DolphinQt/Config/PatchesWidget.cpp
+++ b/Source/Core/DolphinQt/Config/PatchesWidget.cpp
@ -16,7 +16,6 @@

 #include "DolphinQt/Config/HardcoreWarningWidget.h"
 #include "DolphinQt/Config/NewPatchDialog.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"

 #include "UICommon/GameFile.h"

@ -94,7 +93,6 @@ void PatchesWidget::OnAdd()
  bool new_patch_confirmed = false;
  {
    NewPatchDialog dialog(this, patch);
-    SetQWidgetWindowDecorations(&dialog);
    new_patch_confirmed = dialog.exec();
  }
  if (new_patch_confirmed)
@ -124,7 +122,6 @@ void PatchesWidget::OnEdit()
  bool new_patch_confirmed = false;
  {
    NewPatchDialog dialog(this, patch);
-    SetQWidgetWindowDecorations(&dialog);
    new_patch_confirmed = dialog.exec();
  }
  if (new_patch_confirmed)
--- a/Source/Core/DolphinQt/Config/VerifyWidget.cpp
+++ b/Source/Core/DolphinQt/Config/VerifyWidget.cpp
@ -21,7 +21,6 @@
 #include "DiscIO/Volume.h"
 #include "DiscIO/VolumeVerifier.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/Settings.h"

 VerifyWidget::VerifyWidget(std::shared_ptr<DiscIO::Volume> volume) : m_volume(std::move(volume))
@ -180,7 +179,6 @@ void VerifyWidget::Verify()
                   progress.Reset();
                   return verifier.GetResult();
                 });
-  SetQWidgetWindowDecorations(progress.GetRaw());
  progress.GetRaw()->exec();

  std::optional<DiscIO::VolumeVerifier::Result> result = future.get();
--- a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
@ -37,7 +37,6 @@
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/QueueOnObject.h"
-#include "DolphinQt/QtUtils/SetWindowDecorations.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"

@ -378,7 +377,6 @@ void WiimoteControllersWidget::OnWiimoteConfigure(size_t index)
  MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
  window->setAttribute(Qt::WA_DeleteOnClose, true);
  window->setWindowModality(Qt::WindowModality::WindowModal);
-  SetQWidgetWindowDecorations(window);
  window->show();
 }