diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-16 21:41:31 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-06-22 20:02:08 +0200 |
| commit | 9f53774b1f177b99317b90d756ea8fe9c7930d73 (patch) | |
| tree | a74f4f275416846b239b809453a8d5de7f35a392 /toolkit | |
| parent | 5bd5894379fc9b89958b31db8caf96d13cae86d7 (diff) | |
VCL merge most of NotebookbarTabControlBase
NotebookbarTabControlBase (NBBTCB) tried to be clever and save
a bool per TabControl page, by not adding a mbVisible to the
ImplTabItem and misuse mbEnabled.
The result is not only a bug with tab highlighting in notebook
bars, but also a lot of duplicate code and additional virtual
functions. Normal TabControls highlight correct.
I'm not 100% sure about the dropped Resize()s, but the code in
ImplPaint() and calculateRequisition() differs by three lines;
which can be merged by adding the TabControl feature to hide
tabs and not just disable them. I first tried to additionally
merge ImplPlaceTabs() too, but the NBBTCB version differs much
more and I didn't want to touch larger parts of TabControl.
Change-Id: Ie6e18fb03b76b46e3627923eb1ac0f674c3eb7e8
Reviewed-on: https://gerrit.libreoffice.org/74126
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 6540912ae1a570fd8c2318f77b757e07b87c0707)
Reviewed-on: https://gerrit.libreoffice.org/74568
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtabpagecontainer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 56e492ea8069..25ff686c5466 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -190,7 +190,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const css::container::Conta pTabCtrl->SetHelpText(nPageID,xP->getToolTip()); pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL())); pTabCtrl->SelectTabPage(nPageID); - pTabCtrl->EnablePage(nPageID,xP->getEnabled()); + pTabCtrl->SetPageEnabled(nPageID,xP->getEnabled()); m_aTabPages.push_back(xTabPage); } |