claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Only the main window and its childs should be native widgets"

Browse Source 
This reverts commit fe3aab2a0e.
This commit is contained in:
Cacodemon345
2024-01-17 01:26:11 +06:00
parent fe3aab2a0e
commit 50e1a88463
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/qt/qt_main.cpp
View File

@@ -176,6 +176,7 @@ main(int argc, char *argv[])
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
Q_INIT_RESOURCE(darkstyle); Q_INIT_RESOURCE(darkstyle);
QApplication::setAttribute(Qt::AA_NativeWindows);
if (!windows_is_light_theme()) { if (!windows_is_light_theme()) {
QFile f(":qdarkstyle/dark/darkstyle.qss"); QFile f(":qdarkstyle/dark/darkstyle.qss");

7
src/qt/qt_styleoverride.cpp
View File

@@ -16,8 +16,6 @@
*/ */
#include "qt_styleoverride.hpp" #include "qt_styleoverride.hpp"
#include "qt_mainwindow.hpp"
#include <QComboBox> #include <QComboBox>
#include <QAbstractItemView> #include <QAbstractItemView>
@@ -28,8 +26,6 @@
#endif #endif
#endif #endif
extern MainWindow* main_window;
int int
StyleOverride::styleHint( StyleOverride::styleHint(
StyleHint hint, StyleHint hint,
@@ -63,9 +59,6 @@ StyleOverride::polish(QWidget *widget)
extern bool windows_is_light_theme(); extern bool windows_is_light_theme();
BOOL DarkMode = !windows_is_light_theme(); BOOL DarkMode = !windows_is_light_theme();
DwmSetWindowAttribute((HWND)widget->winId(), DWMWA_USE_IMMERSIVE_DARK_MODE, (LPCVOID)&DarkMode, sizeof(DarkMode)); DwmSetWindowAttribute((HWND)widget->winId(), DWMWA_USE_IMMERSIVE_DARK_MODE, (LPCVOID)&DarkMode, sizeof(DarkMode));
if (main_window->isAncestorOf(widget)) {
widget->setAttribute(Qt::WA_NativeWindow);
}
#endif #endif
} }