diff options
author | Antoine Damhet | 2020-08-29 10:04:30 +0200 |
---|---|---|
committer | Antoine Damhet | 2020-08-29 10:04:30 +0200 |
commit | 634213618ff01a5deeffdd1fffa94eaec57c3e1b (patch) | |
tree | 314c53d567b0a09e2c4569f21637feea934c2778 /0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch | |
parent | 7b430130e338a84228a6326e3ed1ea42209412bf (diff) | |
download | aur-634213618ff01a5deeffdd1fffa94eaec57c3e1b.tar.gz |
update patches from pull request
Signed-off-by: Antoine Damhet <antoine.damhet@lse.epita.fr>
Diffstat (limited to '0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch')
-rw-r--r-- | 0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch b/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch index 84e49a418fdd..1191439e35cb 100644 --- a/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch +++ b/0020-UI-Check-for-Expose-and-PlatformSurface-events-to-cr.patch @@ -1,4 +1,4 @@ -From 0e49f864012ef995870d9debac5fa08d73615b30 Mon Sep 17 00:00:00 2001 +From db7ed40e1e0c566d4c6bed53c283327c9d55ce4c Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com> Date: Thu, 20 Aug 2020 11:58:45 -0300 Subject: [PATCH 20/20] UI: Check for Expose and PlatformSurface events to @@ -9,14 +9,14 @@ receiving the QEvent::Expose [1]. [1] https://bugreports.qt.io/browse/QTBUG-86176 --- - UI/qt-display.cpp | 56 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 56 insertions(+) + UI/qt-display.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 58 insertions(+) diff --git a/UI/qt-display.cpp b/UI/qt-display.cpp -index b230ab4e..5d81c463 100644 +index b230ab4e..4487d460 100644 --- a/UI/qt-display.cpp +++ b/UI/qt-display.cpp -@@ -10,6 +10,56 @@ +@@ -10,6 +10,58 @@ #ifdef ENABLE_WAYLAND #include <obs-nix-platform.h> @@ -35,6 +35,7 @@ index b230ab4e..5d81c463 100644 + QPlatformSurfaceEvent *surfaceEvent; + + switch (event->type()) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 1) + case QEvent::PlatformSurface: + surfaceEvent = + static_cast<QPlatformSurfaceEvent *>(event); @@ -47,6 +48,7 @@ index b230ab4e..5d81c463 100644 + else + mTimerId = startTimer(67); // Arbitrary + break; ++#endif + case QEvent::Expose: + createOBSDisplay(); + break; @@ -73,7 +75,7 @@ index b230ab4e..5d81c463 100644 #endif static inline long long color_to_int(const QColor &color) -@@ -65,6 +115,12 @@ OBSQTDisplay::OBSQTDisplay(QWidget *parent, Qt::WindowFlags flags) +@@ -65,6 +117,12 @@ OBSQTDisplay::OBSQTDisplay(QWidget *parent, Qt::WindowFlags flags) connect(windowHandle(), &QWindow::visibleChanged, windowVisible); connect(windowHandle(), &QWindow::screenChanged, screenChanged); |