Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxNotebook::CalcSizeFromPage() to account for tabs height

Browse Source 
Actually implement this function instead of just returning the size
passed into it.

Closes https://github.com/wxWidgets/wxWidgets/pull/1425
This commit is contained in:
Graham Dawes
2019-07-16 08:15:47 +01:00
committed by Vadim Zeitlin
parent 1ca012240a
commit c8eef72417
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/notebook.cpp
View File

@@ -14,6 +14,7 @@
#include "wx/qt/private/winevent.h" #include "wx/qt/private/winevent.h"
#include <QtWidgets/QTabWidget> #include <QtWidgets/QTabWidget>
#include <QtWidgets/QTabBar>
class wxQtTabWidget : public wxQtEventSignalHandler< QTabWidget, wxNotebook > class wxQtTabWidget : public wxQtEventSignalHandler< QTabWidget, wxNotebook >
{ {
@@ -162,7 +163,10 @@ bool wxNotebook::InsertPage(size_t n, wxWindow *page, const wxString& text,
wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
{ {
return sizePage; QTabBar *tabBar = m_qtTabWidget->tabBar();
const QSize &tabBarSize = tabBar->size();
return wxSize(sizePage.GetWidth(),
sizePage.GetHeight() + tabBarSize.height());
} }
bool wxNotebook::DeleteAllPages() bool wxNotebook::DeleteAllPages()