From 5978094fa0e1ffd84406f61827895cb66a22ec27 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 14 Sep 2020 15:27:17 -0700
Subject: [PATCH] UI: Fix certain buttons turning up white in dark theme

Fixes the browse button in the remux file dialog not having the proper
style applied. This is a bit of a workaround because it is still unknown
why the button was white.
---
 UI/obs-app.cpp           | 2 --
 UI/window-basic-main.cpp | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 136761e3b..fdc7f09c0 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -43,7 +43,6 @@
 #include "window-basic-settings.hpp"
 #include "crash-report.hpp"
 #include "platform.hpp"
-#include "obs-proxy-style.hpp"
 
 #include <fstream>
 
@@ -1090,7 +1089,6 @@ bool OBSApp::SetTheme(std::string name, std::string path)
 	QString mpath = QString("file:///") + path.c_str();
 	setPalette(defaultPalette);
 	setStyleSheet(mpath);
-	setStyle(new OBSProxyStyle);
 	ParseExtraThemeData(path.c_str());
 
 	emit StyleChanged();
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 4b5db15f4..83a41e627 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -53,6 +53,7 @@
 #include "window-remux.hpp"
 #include "qt-wrappers.hpp"
 #include "context-bar-controls.hpp"
+#include "obs-proxy-style.hpp"
 #include "display-helpers.hpp"
 #include "volume-control.hpp"
 #include "remote-text.hpp"
@@ -217,6 +218,7 @@ OBSBasic::OBSBasic(QWidget *parent)
 
 	ui->setupUi(this);
 	ui->previewDisabledWidget->setVisible(false);
+	ui->contextContainer->setStyle(new OBSProxyStyle);
 
 	startingDockLayout = saveState();