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

Fix vertical size and position of wxTreeTextCtrl

Browse source 
Use vertical component of the size returned from GetSizeFromTextSize()
too, not only the horizontal one, to ensure we make the control tall
enough to fit its contents.
This commit is contained in:
Vadim Zeitlin 2023-02-02 17:11:33 +01:00
parent 3e01634976
commit 0e16d866ed
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/generic/treectlg.cpp
View file

@ -428,6 +428,11 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
m_owner = owner;
m_aboutToFinish = false;
// Create the text hidden to show it with the correct size -- which we
// can't determine before creating it.
Hide();
Create(m_owner, wxID_ANY, m_startValue);
wxRect rect;
m_owner->GetBoundingRect(m_itemEdited, rect, true);
@ -438,10 +443,20 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
rect.x -= 5;
#endif // platforms
(void)Create(m_owner, wxID_ANY, m_startValue,
rect.GetPosition(), rect.GetSize());
const wxSize textSize = rect.GetSize();
wxSize fullSize = GetSizeFromTextSize(textSize);
if ( fullSize.y > textSize.y )
{
// It's ok to extend the rect to the right horizontally, which happens
// when we just change its size without changing its position below,
// but when extending it vertically, we need to keep it centered.
rect.y -= (fullSize.y - textSize.y + 1) / 2;
}
IncreaseSizeForText(m_startValue);
rect.SetSize(fullSize);
SetSize(rect);
Show();
SelectAll();
}