Merge pull request #1623 from SuslikV/patch-11

UI: Correct custom property implementation

UI/data/themes/Acri.qss

@@ -904,8 +904,8 @@ FocusList::item {
 
 /* Preview background color */
 
-* [themeID="displayBackgroundColor"] {
-    qproperty-displayBackgroundColor: #28282A;
+OBSQTDisplay {
+	qproperty-displayBackgroundColor: #28282A;
 }
 
 /* Preview/Program labels */

UI/data/themes/Dark.qss

@@ -695,8 +695,8 @@ QLabel#errorLabel {
 
 /* Preview background color */
 
-* [themeID="displayBackgroundColor"] {
-    qproperty-displayBackgroundColor: rgb(76, 76, 76);
+OBSQTDisplay {
+	qproperty-displayBackgroundColor: rgb(76, 76, 76);
 }
 
 /* Preview/Program labels */

UI/data/themes/Rachni.qss

@@ -1260,8 +1260,8 @@ QToolTip {
 
 /* Preview background color */
 
-* [themeID="displayBackgroundColor"] {
-    qproperty-displayBackgroundColor: rgb(35, 38, 41);
+OBSQTDisplay {
+	qproperty-displayBackgroundColor: rgb(35, 38, 41);
 }
 
 /* Preview/Program labels */

UI/data/themes/System.qss

@@ -138,8 +138,8 @@ QLabel#errorLabel {
 
 /* Preview background color */
 
-* [themeID="displayBackgroundColor"] {
-    qproperty-displayBackgroundColor: rgb(76, 76, 76);
+OBSQTDisplay {
+	qproperty-displayBackgroundColor: rgb(76, 76, 76);
 }
 
 /* Preview/Program labels */

UI/qt-display.cpp

@@ -19,6 +19,13 @@ static inline long long color_to_int(QColor color)
 		shift(color.alpha(), 24);
 }
 
+static inline QColor rgba_to_color(uint32_t rgba)
+{
+	return QColor::fromRgb(rgba & 0xFF,
+	                       (rgba >> 8) & 0xFF,
+	                       (rgba >> 16) & 0xFF,
+	                       (rgba >> 24) & 0xFF);
+}
 
 OBSQTDisplay::OBSQTDisplay(QWidget *parent, Qt::WindowFlags flags)
 	: QWidget(parent, flags)
@@ -53,13 +60,25 @@ OBSQTDisplay::OBSQTDisplay(QWidget *parent, Qt::WindowFlags flags)
 
 	connect(windowHandle(), &QWindow::visibleChanged, windowVisible);
 	connect(windowHandle(), &QWindow::screenChanged, sizeChanged);
+}
 
-	this->setProperty("themeID", "displayBackgroundColor");
+QColor OBSQTDisplay::GetDisplayBackgroundColor() const
+{
+	return rgba_to_color(backgroundColor);
 }
 
 void OBSQTDisplay::SetDisplayBackgroundColor(const QColor &color)
 {
-	backgroundColor = (uint32_t)color_to_int(color);
+	uint32_t newBackgroundColor = (uint32_t)color_to_int(color);
+
+	if (newBackgroundColor != backgroundColor) {
+		backgroundColor = newBackgroundColor;
+		UpdateDisplayBackgroundColor();
+	}
+}
+
+void OBSQTDisplay::UpdateDisplayBackgroundColor()
+{
 	obs_display_set_background_color(display, backgroundColor);
 }
 

UI/qt-display.hpp

@@ -3,9 +3,12 @@
 #include <QWidget>
 #include <obs.hpp>
 
+#define GREY_COLOR_BACKGROUND 0xFF4C4C4C
+
 class OBSQTDisplay : public QWidget {
 	Q_OBJECT
 	Q_PROPERTY(QColor displayBackgroundColor MEMBER backgroundColor
+			READ GetDisplayBackgroundColor
 			WRITE SetDisplayBackgroundColor)
 
 	OBSDisplay display;
@@ -27,8 +30,9 @@ public:
 
 	inline obs_display_t *GetDisplay() const {return display;}
 
-	uint32_t backgroundColor;
+	uint32_t backgroundColor = GREY_COLOR_BACKGROUND;
 
-private slots:
+	QColor GetDisplayBackgroundColor() const;
 	void SetDisplayBackgroundColor(const QColor &color);
+	void UpdateDisplayBackgroundColor();
 };

UI/window-projector.cpp

@@ -67,7 +67,6 @@ OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
 		obs_display_add_draw_callback(GetDisplay(),
 				isMultiview ? OBSRenderMultiview : OBSRender,
 				this);
-		obs_display_set_background_color(GetDisplay(), 0x000000);
 	};
 
 	connect(this, &OBSQTDisplay::DisplayCreated, addDrawCallback);