summarylogtreecommitdiffstats
path: root/0021-Don-t-create-native-widget-siblings.patch
diff options
context:
space:
mode:
authorAntoine Damhet2020-10-06 09:03:37 +0200
committerAntoine Damhet2020-10-06 09:03:37 +0200
commit00cef947b33543f6e21233d389aa77501d6ab6b3 (patch)
tree1c513842c14b1d62af26037cf82ba846d18be02e /0021-Don-t-create-native-widget-siblings.patch
parent7d051afb6137d0240f2579369c51a27ddf64be1e (diff)
downloadaur-00cef947b33543f6e21233d389aa77501d6ab6b3.tar.gz
update to 26 & patches from pull request
Signed-off-by: Antoine Damhet <antoine.damhet@lse.epita.fr>
Diffstat (limited to '0021-Don-t-create-native-widget-siblings.patch')
-rw-r--r--0021-Don-t-create-native-widget-siblings.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0021-Don-t-create-native-widget-siblings.patch b/0021-Don-t-create-native-widget-siblings.patch
index ed30512b5815..312d43613d72 100644
--- a/0021-Don-t-create-native-widget-siblings.patch
+++ b/0021-Don-t-create-native-widget-siblings.patch
@@ -1,7 +1,7 @@
-From cbb48e4213f5666a8714a8d644f8f8fb1473d793 Mon Sep 17 00:00:00 2001
+From 6e20eb830789cdf33c24e13a36f4d860b777d7b3 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Wed, 16 Sep 2020 15:24:22 +0100
-Subject: [PATCH 21/24] Don't create native widget siblings
+Subject: [PATCH 21/25] Don't create native widget siblings
Native windows really only make sense for previews. They can be a new
xcb_window or a wayland subsurface.
@@ -20,10 +20,10 @@ This default behaviour can be turned off. Now only the native widgets
1 file changed, 1 insertion(+)
diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
-index 8335c2ce..44df67ad 100644
+index ce350f06..09f1ae60 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
-@@ -1353,6 +1353,7 @@ bool OBSApp::OBSInit()
+@@ -1376,6 +1376,7 @@ bool OBSApp::OBSInit()
ProfileScope("OBSApp::OBSInit");
setAttribute(Qt::AA_UseHighDpiPixmaps);