vcl/source/window/dialog.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 00aaada667af4d7138e3ddca153c37afd5f61f23
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Sep 20 12:05:48 2019 +0100
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Tue Oct 8 11:42:20 2019 +0200

    Resolves: tdf#127645 ignore floating windows like we do tooltips
    
    Change-Id: I727e10a1e884841554437e376bde2ff483d278a4
    Reviewed-on: https://gerrit.libreoffice.org/79284
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1f1c3721583d..622004df141a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1602,8 +1602,13 @@ void TopLevelWindowLocker::incBusy(const weld::Widget* 
pIgnore)
         if (pCandidate->GetType() == WindowType::BORDERWINDOW)
             pCandidate = pCandidate->GetWindow(GetWindowType::FirstChild);
         // tdf#125266 ignore HelpTextWindows
-        if (pCandidate && pCandidate->GetType() != WindowType::HELPTEXTWINDOW 
&& pCandidate->GetFrameWeld() != pIgnore)
+        if (pCandidate &&
+            pCandidate->GetType() != WindowType::HELPTEXTWINDOW &&
+            pCandidate->GetType() != WindowType::FLOATINGWINDOW &&
+            pCandidate->GetFrameWeld() != pIgnore)
+        {
             aTopLevels.push_back(pCandidate);
+        }
         pTopWin = Application::GetNextTopLevelWindow(pTopWin);
     }
     for (auto& a : aTopLevels)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to