Windows background color fixes

diff --git a/src/loadingwidget.cpp b/src/loadingwidget.cpp
index a1c81dd931107ae37392c493d004dad958b8fc56..03f5fd37710396134ef082956946e68c84718c6c 100644 (file)
--- a/src/loadingwidget.cpp
+++ b/src/loadingwidget.cpp
@@ -3,7 +3,7 @@
 LoadingWidget::LoadingWidget(QWidget *parent) : QWidget(parent) {
 
     QPalette p = palette();
-    p.setBrush(QPalette::Window, Qt::black);
+    p.setBrush(backgroundRole(), Qt::black);
     p.setBrush(QPalette::Text, Qt::white);
     setPalette(p);
 

diff --git a/src/main.cpp b/src/main.cpp
index c114f7c1dd34639ad9eabda3cc28c1a77ef07307..9b2e1762eeb4d8f99494e84848a69ca2e1529c6b 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,9 +7,6 @@
 #include "mac_startup.h"
 #include "macfullscreen.h"
 #endif
-#ifdef APP_WIN
-#include "local/win/qtwin.h"
-#endif
 #include "iconloader/qticonloader.h"
 
 int main(int argc, char **argv) {
@@ -95,10 +92,6 @@ int main(int argc, char **argv) {
 #endif
 
 #ifdef APP_WIN
-    if (QtWin::isCompositionEnabled()) {
-        QtWin::extendFrameIntoClientArea(&mainWin);
-        mainWin.setContentsMargins(0, 0, 0, 0);
-    }
     app.setFont(QFont("Segoe UI", 9));
 #endif
 

diff --git a/src/videoareawidget.cpp b/src/videoareawidget.cpp
index 7411b221122dd946aa45df0c339d1f008641e647..a8432ac9feced16c9eef9127cb6b6da95254d44f 100644 (file)
--- a/src/videoareawidget.cpp
+++ b/src/videoareawidget.cpp
@@ -11,7 +11,6 @@ VideoAreaWidget::VideoAreaWidget(QWidget *parent) : QWidget(parent) {
     p.setBrush(QPalette::Window, Qt::black);
     setPalette(p);
     setAutoFillBackground(true);
-    setStyleSheet("background:black");
 #endif
 
     // hidden message widget