solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Avoid resizing wxAuiToolBar to size in the wrong orientation

Browse source 
This is unnecessary and resulted in sometimes visible flicker, when the
wrong shape of the toolbar could be temporarily seen on screen before it
was replaced with the correct one.

Only set the actual window size in Realize(), and do it only for the
current orientation, instead of doing it in RealizeHelper() which is
called for both the current orientation and the transversal one.

Closes #24023.
This commit is contained in:
Vadim Zeitlin 2023-12-25 20:54:16 +01:00
parent de4c0af402
commit d85e26434c
1 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/aui/auibar.cpp
View file

@ -1875,17 +1875,44 @@ bool wxAuiToolBar::Realize()
if (!dc.IsOk())
return false;
// calculate hint sizes for both horizontal and vertical
// in the order that leaves toolbar in correct final state
// calculate hint sizes for both horizontal and vertical orientations and
// store the size appropriate for the current orientation in this variable.
wxSize size;
if (m_orientation == wxHORIZONTAL)
{
m_vertHintSize = RealizeHelper(dc, wxVERTICAL);
m_horzHintSize = RealizeHelper(dc, wxHORIZONTAL);
size = m_horzHintSize;
}
else
{
m_horzHintSize = RealizeHelper(dc, wxHORIZONTAL);
m_vertHintSize = RealizeHelper(dc, wxVERTICAL);
size = m_vertHintSize;
}
// set control size
m_minWidth = size.x;
m_minHeight = size.y;
wxSize curSize = GetClientSize();
if ((m_windowStyle & wxAUI_TB_NO_AUTORESIZE) == 0)
{
if (size != curSize)
{
SetClientSize(size);
}
else
{
m_sizer->SetDimension(0, 0, curSize.x, curSize.y);
}
}
else
{
m_sizer->SetDimension(0, 0, curSize.x, curSize.y);
}
Refresh(false);
@ -2092,31 +2119,7 @@ wxSize wxAuiToolBar::RealizeHelper(wxClientDC& dc, wxOrientation orientation)
item.m_sizerItem->SetMinSize(item.m_minSize);
}
// set control size
wxSize size = m_sizer->GetMinSize();
m_minWidth = size.x;
m_minHeight = size.y;
wxSize curSize = GetClientSize();
if ((m_windowStyle & wxAUI_TB_NO_AUTORESIZE) == 0)
{
wxSize new_size = GetMinSize();
if (new_size != curSize)
{
SetClientSize(new_size);
}
else
{
m_sizer->SetDimension(0, 0, curSize.x, curSize.y);
}
}
else
{
m_sizer->SetDimension(0, 0, curSize.x, curSize.y);
}
return GetSize();
return m_sizer->GetMinSize();
}
int wxAuiToolBar::GetOverflowState() const