diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-01-19 23:07:47 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-01-21 14:40:09 +0000 |
| commit | 39471da6e4d016c52c6cdf6553d7418416a160f4 (patch) | |
| tree | 285280e63b96fcf2066f1c56249a7fc0326c16ba /include | |
| parent | e7eca35148204d094dcdb7d8b3e4ec6c9d454159 (diff) | |
tdf#95587: Make rectangle control within tab pages work again
Since commit 74407aef94b6d8dfdd6, tab pages|controls are
considered to be container widgets (thus, search for the nearest
non-layout parent will never find a tab page parent, breaking
rectangle control in many dialogs). I've no idea how many
other functions' behaviour this changes in an unexpected way,
so I've reverted that bit.
That however means implementing slightly different approach to
tdf#92630 in dialogs (for a tab dialog, find current tab page
and go through its children)
Change-Id: I3ff5ac13f04b1c5c799c7a1a3769108927809f31
Reviewed-on: https://gerrit.libreoffice.org/21615
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/layout.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index be86c75cb202..6bdef038d016 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -704,7 +704,6 @@ inline bool isContainerWindow(const vcl::Window &rWindow) { WindowType eType = rWindow.GetType(); return eType == WINDOW_CONTAINER || eType == WINDOW_SCROLLWINDOW || - eType == WINDOW_TABCONTROL || eType == WINDOW_TABPAGE || (eType == WINDOW_DOCKINGWINDOW && ::isLayoutEnabled(&rWindow)); } |