Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-22 14:20:35 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Simplify tool size calculation code in wxAuiGenericToolBarArt

Browse Source 
Call GetTextExtent() only once and store its result instead of calling
it from 3 different places.

Also rely on GetTextExtent() returning (0,0) for the empty string and
remove checks for the label being empty.
This commit is contained in:
Vadim Zeitlin
2025-11-28 17:23:17 +01:00
parent f1e9728832
commit b4f23213a9
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aui/auibar.cpp
+11 -15
View File
@@ -603,31 +603,27 @@ wxSize wxAuiGenericToolBarArt::GetToolSize(
if (m_flags & wxAUI_TB_TEXT)
{
dc.SetFont(m_font);
int tx, ty;
const wxSize textSize = dc.GetTextExtent(item.GetLabel());
if (m_textOrientation == wxAUI_TBTOOL_TEXT_BOTTOM)
{
dc.GetTextExtent(wxT("ABCDHgj"), &tx, &ty);
height += ty;
// Reuse the height of text if we already have it, otherwise (i.e.
// if the label is empty) use the character height.
height += textSize.y ? textSize.y : dc.GetCharHeight();
if ( !item.GetLabel().empty() )
{
dc.GetTextExtent(item.GetLabel(), &tx, &ty);
width = wxMax(width, tx+wnd->FromDIP(6));
}
const int widthWithMargins = textSize.x + wnd->FromDIP(6);
if ( widthWithMargins > width )
width = widthWithMargins;
}
else if ( m_textOrientation == wxAUI_TBTOOL_TEXT_RIGHT &&
!item.GetLabel().empty() )
textSize.x != 0 )
{
width += wnd->FromDIP(3); // space between left border and bitmap
width += wnd->FromDIP(3); // space between bitmap and text
if ( !item.GetLabel().empty() )
{
dc.GetTextExtent(item.GetLabel(), &tx, &ty);
width += tx;
height = wxMax(height, ty);
}
width += textSize.x;
if ( textSize.y > height )
height = textSize.y;
}
}