[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 243db6880cf1337de237e258fad1524413db848c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 20 12:05:48 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 20 14:02:49 2019 +0200

    Resolves: tdf#127645 ignore floating windows like we do tooltips
    
    Change-Id: I727e10a1e884841554437e376bde2ff483d278a4
    Reviewed-on: https://gerrit.libreoffice.org/79282
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1c6dbda3375b..387e47df0f1b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1600,8 +1600,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)