mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-21 01:31:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "More work on theming"

Browse source 
This reverts commit cc775770bf.
This commit is contained in:
Nayla Hanegan 2024-05-23 17:34:15 -04:00
parent cc775770bf
commit b4cc0fc9ca
6 changed files with 6 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/Core/DolphinQt/MainWindow.cpp
View file

@ -32,8 +32,6 @@
#ifndef _WIN32
#include <qpa/qplatformnativeinterface.h>
#include <windows.h>
#include <iostream>
#endif
#include "Common/ScopeGuard.h"
@ -148,7 +146,6 @@
#endif
#include <qprocess.h>
#include <qoperatingsystemversion.h>
#if defined(__unix__) || defined(__unix) || defined(__APPLE__)
void MainWindow::OnSignal()
@ -244,15 +241,6 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
ConnectMenuBar();
ConnectHotkeys();
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
auto current = QOperatingSystemVersion::current();
if (current >= QOperatingSystemVersion::Windows11)
{
connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this,
[](Qt::ColorScheme colorScheme) { Settings::Instance().ApplyStyleWin10(); });
}
#endif
connect(m_cheats_manager, &CheatsManager::OpenGeneralSettings, this,
&MainWindow::ShowGeneralWindow);
@ -1870,37 +1858,9 @@ QSize MainWindow::sizeHint() const
}
#ifdef _WIN32
bool MainWindow::nativeEvent(const QByteArray& eventType, void* message, qintptr* result)
{
MSG* msg = reinterpret_cast<MSG*>(message);
auto current = QOperatingSystemVersion::current();
if (msg && msg->message == WM_SETTINGCHANGE &&
(current >= QOperatingSystemVersion::Windows11) &&
msg->lParam != NULL &&
std::wstring_view(L"ImmersiveColorSet")
.compare(reinterpret_cast<const wchar_t*>(msg->lParam)) == 0)
{
// Windows light/dark theme has changed. Update our flag and refresh the theme.
auto& settings = Settings::Instance();
const bool was_dark_before = settings.IsSystemDark();
settings.UpdateSystemDark();
if (settings.IsSystemDark() != was_dark_before)
{
auto current = QOperatingSystemVersion::current();
if (current >= QOperatingSystemVersion::Windows11)
{
settings.ApplyStyleWin10();
// force the colors in the Skylander window to update
if (m_skylander_window)
m_skylander_window->RefreshList();
}
}
return true; // Event was handled
}
return false; // Event was not handled
return false;
}
#endif