summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-20 12:05:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-20 14:02:49 +0200
commit243db6880cf1337de237e258fad1524413db848c (patch)
tree43373f475ffe1645f94baa0bc1eda4329bdeb06b /vcl
parented7df853b62f9ed429ce277bb4a5f72ba8f3f520 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/dialog.cxx7
1 files changed, 6 insertions, 1 deletions
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)