From 50e1a8846362d4bb94d87a1ebcea58ae53d9a2b1 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Wed, 17 Jan 2024 01:26:11 +0600 Subject: [PATCH] Revert "Only the main window and its childs should be native widgets" This reverts commit fe3aab2a0e6c32b0ef377a676b601dec1de479e6. --- src/qt/qt_main.cpp | 1 + src/qt/qt_styleoverride.cpp | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index afe3a9469..23fafc3ce 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -176,6 +176,7 @@ main(int argc, char *argv[]) #ifdef Q_OS_WINDOWS Q_INIT_RESOURCE(darkstyle); + QApplication::setAttribute(Qt::AA_NativeWindows); if (!windows_is_light_theme()) { QFile f(":qdarkstyle/dark/darkstyle.qss"); diff --git a/src/qt/qt_styleoverride.cpp b/src/qt/qt_styleoverride.cpp index 43a9d9980..60a7162a5 100644 --- a/src/qt/qt_styleoverride.cpp +++ b/src/qt/qt_styleoverride.cpp @@ -16,8 +16,6 @@ */ #include "qt_styleoverride.hpp" -#include "qt_mainwindow.hpp" - #include #include @@ -28,8 +26,6 @@ #endif #endif -extern MainWindow* main_window; - int StyleOverride::styleHint( StyleHint hint, @@ -63,9 +59,6 @@ StyleOverride::polish(QWidget *widget) extern bool windows_is_light_theme(); BOOL DarkMode = !windows_is_light_theme(); DwmSetWindowAttribute((HWND)widget->winId(), DWMWA_USE_IMMERSIVE_DARK_MODE, (LPCVOID)&DarkMode, sizeof(DarkMode)); - if (main_window->isAncestorOf(widget)) { - widget->setAttribute(Qt::WA_NativeWindow); - } #endif }