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

Invalidate wxListBox best size immediately without waiting for idle time.

Browse Source 
Since r53743 the listbox best size was only invalidated during idle time but
this meant that it could be laid out using incorrect old best size. So while
we still defer (expensive) horizontal extent calculation until later, do
invalidate the best size immediately to ensure the listbox is laid out
correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-05-08 10:28:01 +00:00
parent 1544ba0edc
commit 316bba0c72
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/msw/listbox.cpp
View File

@@ -186,7 +186,6 @@ bool wxListBox::Create(wxWindow *parent,
}
// now we can compute our best size correctly, so do it again
InvalidateBestSize();
SetInitialSize(size);
return true;
@@ -269,6 +268,22 @@ void wxListBox::OnInternalIdle()
}
}
void wxListBox::MSWOnItemsChanged()
{
// we need to do two things when items change: update their max horizontal
// extent so that horizontal scrollbar could be shown or hidden as
// appropriate and also invlaidate the best size
//
// updating the max extent is slow (it's an O(N) operation) and so we defer
// it until the idle time but the best size should be invalidated
// immediately doing it in idle time is too late -- layout using incorrect
// old best size will have been already done by then
m_updateHorizontalExtent = true;
InvalidateBestSize();
}
// ----------------------------------------------------------------------------
// implementation of wxListBoxBase methods
// ----------------------------------------------------------------------------
@@ -297,8 +312,7 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
m_noItems--;
// SetHorizontalExtent(wxEmptyString); can be slow
m_updateHorizontalExtent = true;
MSWOnItemsChanged();
UpdateOldSelections();
}
@@ -328,7 +342,7 @@ void wxListBox::DoClear()
ListBox_ResetContent(GetHwnd());
m_noItems = 0;
m_updateHorizontalExtent = true;
MSWOnItemsChanged();
UpdateOldSelections();
}
@@ -486,7 +500,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
AssignNewItemClientData(n, clientData, i, type);
}
m_updateHorizontalExtent = true;
MSWOnItemsChanged();
UpdateOldSelections();
@@ -537,7 +551,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
if ( wasSelected )
Select(n);
m_updateHorizontalExtent = true;
MSWOnItemsChanged();
}
unsigned int wxListBox::GetCount() const
@@ -551,9 +565,6 @@ unsigned int wxListBox::GetCount() const
void wxListBox::SetHorizontalExtent(const wxString& s)
{
// in any case, our best size could have changed
InvalidateBestSize();
// the rest is only necessary if we want a horizontal scrollbar
if ( !HasFlag(wxHSCROLL) )
return;