mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tabpages size req not factoring in border width

Browse Source 
Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1
This commit is contained in:
Caolán McNamara
2013-02-15 12:38:42 +00:00
parent 158aee9ad3
commit 1ccbb62094
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/source/control/tabctrl.cxx
View File

@@ -29,6 +29,7 @@
#include "vcl/tabpage.hxx" #include "vcl/tabpage.hxx"
#include "vcl/tabctrl.hxx" #include "vcl/tabctrl.hxx"
#include "vcl/controllayout.hxx" #include "vcl/controllayout.hxx"
#include "vcl/layout.hxx"
#include "vcl/lstbox.hxx" #include "vcl/lstbox.hxx"
#include "controldata.hxx" #include "controldata.hxx"
@@ -2219,7 +2220,7 @@ Size TabControl::calculateRequisition() const
if (!pPage) if (!pPage)
continue; continue;
Size aPageSize(pPage->GetOptimalSize()); Size aPageSize(VclContainer::getLayoutRequisition(*pPage));
if (aPageSize.Width() > aOptimalPageSize.Width()) if (aPageSize.Width() > aOptimalPageSize.Width())
aOptimalPageSize.Width() = aPageSize.Width(); aOptimalPageSize.Width() = aPageSize.Width();

2
vcl/source/window/tabpage.cxx
View File

@@ -210,7 +210,7 @@ bool TabPage::isLayoutEnabled() const
Size TabPage::GetOptimalSize() const Size TabPage::GetOptimalSize() const
{ {
if (isLayoutEnabled()) if (isLayoutEnabled())
return GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(); return VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD));
return getLegacyBestSizeForChildren(*this); return getLegacyBestSizeForChildren(*this);
} }