LibreOffice: fix popup windows

app-office/libreoffice/libreoffice-7.2.0.4.recipe

@@ -17,7 +17,7 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2021 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="1"
+REVISION="2"
 
 SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
 SOURCE_DIR="core-libreoffice-$portVersion"

app-office/libreoffice/patches/libreoffice-7.2.0.4.patchset

@@ -1,4 +1,4 @@
-From 2318e8b866e748bb5808504a85f29e1faa2c5668 Mon Sep 17 00:00:00 2001
+From 2c83f2d6504b192a0fa0832ee2a97b94fde6a795 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 15 Feb 2020 14:52:59 +0300
 Subject: Make Elementary the default on Haiku
@@ -22,7 +22,7 @@ index 253242b..6b55799 100644
 2.30.2
 
 
-From 4db9b4b3a0b7145f3bb8030e7f2e6c49628a58df Mon Sep 17 00:00:00 2001
+From a73eb5ed50cbb7cae46fecd18317a3bc4433edde Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Aug 2020 12:14:40 +0300
 Subject: Show used vcl backend in About window on Haiku
@@ -45,7 +45,7 @@ index 79d6dfa..6071ffe 100644
 2.30.2
 
 
-From 93354e746eaf3dc60528663dbc35b7cf047dce5c Mon Sep 17 00:00:00 2001
+From 93355f10e60eadabe8459212452786e5eed14f54 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:01:34 +0300
 Subject: Identify Haiku in about window
@@ -88,7 +88,7 @@ index 0093f64..04042bd 100644
 2.30.2
 
 
-From a17a0ca9457b5c7dfe2ae600ea4df42d4820f402 Mon Sep 17 00:00:00 2001
+From 9da1a2cc3a16ca855051142053bb5c501d304ec3 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 15 Feb 2020 15:04:53 +0300
 Subject: Implement ShellExec on Haiku
@@ -112,7 +112,7 @@ index 87b78fe..7588126 100644
 2.30.2
 
 
-From b95ba255fe77f6d34484837287a0af8e95e785de Mon Sep 17 00:00:00 2001
+From 5fc4fecefd59105d00f3169265cc76081d4d583d Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Sat, 20 Jul 2019 01:18:50 +0300
 Subject: Comment out linking with pthread
@@ -139,7 +139,7 @@ index 4a96547..49f872b 100644
 2.30.2
 
 
-From 8296fb4df4ca1cf27b52ebb2133838b0cd65eb59 Mon Sep 17 00:00:00 2001
+From 023d1c8a0b93d69300a28261ea480189b2bbd060 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 11 Aug 2019 11:47:40 +1000
 Subject: Add XP_HAIKU defs for xmlsec
@@ -183,7 +183,7 @@ index 450e19b..568ff83 100644
 2.30.2
 
 
-From ab45fd09d9d16fb1fdc03ea6033a752209830951 Mon Sep 17 00:00:00 2001
+From 7c3aaa13ad15dbfcafd3b1d899bb29025e459cf9 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Fri, 7 Aug 2020 12:37:45 +0300
 Subject: Cast to boolean
@@ -274,7 +274,7 @@ index 8807927..c570173 100644
 2.30.2
 
 
-From a01bcbe4b0f62ed9e192be507ac10c6c3ed3e1d0 Mon Sep 17 00:00:00 2001
+From 71c4d0955b51728ea771cb9adc62ec58f9ed53fd Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 8 Feb 2021 15:50:11 +1000
 Subject: Use dpi=100 for qt5 backend
@@ -299,7 +299,7 @@ index a2730be..9be0a6e 100644
 2.30.2
 
 
-From bb51c0fe7ffaa397e101a2636832d3ef9340ea6e Mon Sep 17 00:00:00 2001
+From 55411bced7c261727bc45b297fa6416af86b591a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 8 Feb 2021 15:52:13 +1000
 Subject: Disable hidpi for Haiku
@@ -326,7 +326,7 @@ index bf8d529..e8dca9a 100644
 2.30.2
 
 
-From 1674ab119d6e2b02b08d9cad1ebefdb4c48b5f71 Mon Sep 17 00:00:00 2001
+From fe6d8e4802857fca553b3aad7221be3b2d7eba0a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 8 Feb 2021 21:47:12 +1000
 Subject: Don't use fontconfig
@@ -353,7 +353,7 @@ index b429485..0719575 100644
 2.30.2
 
 
-From 8cc8c6f41b1165c71d565215c7c56a5947f34707 Mon Sep 17 00:00:00 2001
+From ea647dec913ffcf242b96d6f94c5873508a8b596 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Aug 2020 12:47:56 +0300
 Subject: Revert fstack-protector check removal in
@@ -436,3 +436,56 @@ index 09ca90a..9248195 100644
 -- 
 2.30.2
 
+
+From 756a5adb7dec21c27d655c265a7bd2f32f6721b1 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Fri, 20 Aug 2021 23:33:13 +1000
+Subject: Revert Qt::Popup window handling
+
+
+diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
+index 02032d1..e0000bd 100644
+--- a/vcl/qt5/Qt5Frame.cxx
++++ b/vcl/qt5/Qt5Frame.cxx
+@@ -144,7 +144,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
+         else if ((nStyle & SalFrameStyleFlags::FLOAT)
+                  && (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION))
+             aWinFlags |= Qt::Tool | Qt::FramelessWindowHint;
+-        else if (nStyle & SalFrameStyleFlags::TOOLTIP)
++        else if (nStyle & (nStyle & SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::TOOLTIP))
+             aWinFlags |= Qt::ToolTip;
+         else if ((nStyle & SalFrameStyleFlags::FLOAT)
+                  && !(nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION))
+diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
+index ebb11ce..dcbc2cc 100644
+--- a/vcl/qt5/Qt5Widget.cxx
++++ b/vcl/qt5/Qt5Widget.cxx
+@@ -177,14 +177,7 @@ void Qt5Widget::handleMouseButtonEvent(const Qt5Frame& rFrame, const QMouseEvent
+     rFrame.CallCallback(nEventType, &aEvent);
+ }
+ 
+-void Qt5Widget::mousePressEvent(QMouseEvent* pEvent)
+-{
+-    if ((windowFlags() & Qt::Popup)
+-        && !geometry().translated(geometry().topLeft() * -1).contains(pEvent->pos()))
+-        close();
+-    else
+-        handleMousePressEvent(m_rFrame, pEvent);
+-}
++void Qt5Widget::mousePressEvent(QMouseEvent* pEvent) { handleMousePressEvent(m_rFrame, pEvent); }
+ 
+ void Qt5Widget::mouseReleaseEvent(QMouseEvent* pEvent)
+ {
+@@ -608,8 +601,7 @@ Qt5Widget::Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f)
+ {
+     create();
+     setMouseTracking(true);
+-    if (!(f & Qt::Popup))
+-        setFocusPolicy(Qt::StrongFocus);
++    setFocusPolicy(Qt::StrongFocus);
+ }
+ 
+ static ExtTextInputAttr lcl_MapUndrelineStyle(QTextCharFormat::UnderlineStyle us)
+-- 
+2.30.2
+