AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reuse helper MSWGetFittingtSizeForControl() in a couple of places

Browse Source 
Refactor the code to reuse the same function for determining the size
needed by an embedded control in the toolbar, including its label.
This commit is contained in:
Vadim Zeitlin 2019-02-24 18:19:49 +01:00
parent c7e8aac70f
commit 7c8ba45705
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/toolbar.h
View File

@ -183,6 +183,10 @@ private:
return HasFlag(wxTB_TEXT) && !HasFlag(wxTB_NOICONS);
}
// Return the size required to accommodate the given tool which must be of
// "control" type.
wxSize MSWGetFittingtSizeForControl(class wxToolBarTool* tool) const;
wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(wxToolBar);

35
src/msw/toolbar.cpp
View File

@ -530,6 +530,31 @@ wxToolBar::~wxToolBar()
delete m_disabledImgList;
}
wxSize wxToolBar::MSWGetFittingtSizeForControl(wxToolBarTool* tool) const
{
wxSize size = tool->GetControl()->GetBestSize();
// Account for the label, if any.
if ( wxStaticText * const staticText = tool->GetStaticText() )
{
if ( AreControlLabelsShown() )
{
const wxSize sizeLabel = staticText->GetSize();
if ( size.x < sizeLabel.x )
size.x = sizeLabel.x;
size.y += sizeLabel.y;
size.y += MARGIN_CONTROL_LABEL;
}
}
// Also account for the tool padding value.
size += wxSize(m_toolPacking, m_toolPacking);
return size;
}
wxSize wxToolBar::DoGetBestSize() const
{
wxSize sizeBest;
@ -578,10 +603,8 @@ wxSize wxToolBar::DoGetBestSize() const
tool = static_cast<wxToolBarTool *>(node->GetData());
if (tool->IsControl())
{
int y = tool->GetControl()->GetSize().y;
// Approximate border size
if (y > (sizeBest.y - 4))
sizeBest.y = y + 4;
// Ensure we're tall enough for the embedded controls.
sizeBest.IncTo(wxSize(-1, MSWGetFittingtSizeForControl(tool).y));
}
}
@ -1057,8 +1080,8 @@ bool wxToolBar::Realize()
// taking into account tool padding value.
// (height is not used but it is set for the sake of consistency).
{
const wxSize sizeControl = tool->GetControl()->GetSize();
button.iBitmap = m_toolPacking + (IsVertical() ? sizeControl.y : sizeControl.x);
const wxSize size = MSWGetFittingtSizeForControl(tool);
button.iBitmap = size.x;
}
wxFALLTHROUGH;