diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:23:09 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:23:09 +0000 |
| commit | 13f9e8cd00351a447e2635f60b7d37f0ebdb3c41 (patch) | |
| tree | 1a41ee79453cb18b67d1da226fa31a3831e629a6 /vcl/source | |
| parent | 16d7699621447181ef50eac75bf4b1a64929eeb7 (diff) | |
INTEGRATION: CWS aquavcl04 (1.22.102); FILE MERGED
2007/11/23 16:00:04 pl 1.22.102.1: #i83908# skip invisible internal taskbar when travelling through floaters
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/taskpanelist.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index f03bc3dc918d..ed4923560e8f 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -4,9 +4,9 @@ * * $RCSfile: taskpanelist.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: hr $ $Date: 2007-06-27 20:35:04 $ + * last change: $Author: ihi $ $Date: 2008-01-14 16:23:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -385,7 +385,13 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, BOOL bForward ) ++p; if( p == mTaskPanes.end() ) break; // do not wrap, send focus back to document at end of list - if( (*p)->IsReallyVisible() && !(*p)->ImplIsSplitter() ) + /* #i83908# do not use the menubar if it is native and invisible + this relies on MenuBar::ImplCreate setting the height of the menubar + to 0 in this case + */ + if( (*p)->IsReallyVisible() && !(*p)->ImplIsSplitter() && + ( (*p)->GetType() != WINDOW_MENUBARWINDOW || (*p)->GetSizePixel().Height() > 0 ) + ) { pWindow = *p; break; |