summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-02 01:46:27 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-08-02 03:17:21 +0200
commit9ca7bda2cc8b67c2d10fcb81cce8bfd4d8b79b09 (patch)
treef0d26e169d669045cc1251ff55cf042ee49427b0
parentTypo: usnig->using (diff)
downloadcore-9ca7bda2cc8b67c2d10fcb81cce8bfd4d8b79b09.tar.gz
core-9ca7bda2cc8b67c2d10fcb81cce8bfd4d8b79b09.zip
uitest: detect real floating windows better
We use the FloatingWindow base class also for some windows that are not independent. A good example is the hyperlink dialog. Change-Id: I067ac0465de9ff3c8f9bc0c1a5c817a5e09d96e5 Reviewed-on: https://gerrit.libreoffice.org/40650 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r--vcl/source/uitest/uiobject.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 5d7132787ea3..ed5a84ab5655 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -97,7 +97,11 @@ bool isDialogWindow(vcl::Window const * pWindow)
bool isTopWindow(vcl::Window const * pWindow)
{
WindowType eType = pWindow->GetType();
- return eType == WindowType::FLOATINGWINDOW;
+ if (eType == WindowType::FLOATINGWINDOW)
+ {
+ return pWindow->GetStyle() & WB_SYSTEMFLOATWIN;
+ }
+ return false;
}
vcl::Window* get_top_parent(vcl::Window* pWindow)