diff options
| author | Jim Raykowski <raykowj@gmail..com> | 2019-11-24 20:01:43 -0900 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-12-11 10:37:08 +0100 |
| commit | 0ab044a4798d9968c303e5616f4a307cab0fd62d (patch) | |
| tree | da7b64fa80f16fa0a57d18bebf2d47541c3c3b2b /vcl/source | |
| parent | ac11dd8365c9e9de67717d18b7983af1eca17eaf (diff) | |
tdf#105518 F6: Skip infobar when it has no children
Change-Id: Id5375d9acfd20844a56da20fcf08c709423f75e0
Reviewed-on: https://gerrit.libreoffice.org/83636
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/taskpanelist.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index c7af916d16b0..307bb4d29a39 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -275,7 +275,12 @@ vcl::Window* TaskPaneList::FindNextFloat( vcl::Window *pWindow, bool bForward ) break; // do not wrap, send focus back to document at end of list /* #i83908# do not use the menubar if it is native and invisible */ - if( (*p)->IsReallyVisible() && !(*p)->ImplIsSplitter() && + + bool bSkip = false; // used to skip infobar when it has no children + if( (*p)->GetType() == WindowType::WINDOW && (*p)->GetChildCount() == 0 ) + bSkip = true; + + if( !bSkip && (*p)->IsReallyVisible() && !(*p)->ImplIsSplitter() && ( (*p)->GetType() != WindowType::MENUBARWINDOW || static_cast<MenuBarWindow*>(p->get())->CanGetFocus() ) ) { pWindow = (*p).get(); |