petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r22228) -Fix (r22135)[FS#4546]: Do not resort town, industry and signs list directly in OnInvalidateData(). There might be a scheduled rebuild which needs execution first. So, only set a trigger for resorting.

Browse Source
This commit is contained in:
frosch
2011-03-08 20:52:59 +00:00
parent b997ebb942
commit 77d1dcb926
6 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/signs_gui.cpp
View File

@@ -164,9 +164,7 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
/* Create initial list. */
this->signs.ForceRebuild();
this->signs.ForceResort();
this->BuildSignsList();
this->SortSignsList();
this->vscroll->SetCount(this->signs.Length());
this->BuildSortSignList();
}
/**
@@ -214,6 +212,7 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
virtual void OnPaint()
{
if (this->signs.NeedRebuild()) this->BuildSortSignList();
this->DrawWidgets();
if (!this->IsShaded()) this->DrawEditBox(SLW_FILTER_TEXT);
}
@@ -352,23 +351,36 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
this->HandleEditBox(SLW_FILTER_TEXT);
}
void BuildSortSignList()
{
if (this->signs.NeedRebuild()) {
this->BuildSignsList();
this->vscroll->SetCount(this->signs.Length());
this->SetWidgetDirty(SLW_CAPTION);
}
this->SortSignsList();
}
virtual void OnHundredthTick()
{
this->BuildSortSignList();
this->SetDirty();
}
virtual void OnInvalidateData(int data)
{
/* When there is a filter string, we always need to rebuild the list even if
* the amount of signs in total is unchanged, as the subset of signs that is
* accepted by the filter might has changed.
*/
*
* We can only set the trigger for resorting/rebuilding.
* We cannot safely resort at this point, as there might be multiple scheduled invalidations,
* and a rebuild needs to be done first though it is scheduled later. */
if (data == 0 || !StrEmpty(this->filter_string)) { // New or deleted sign, or there is a filter string
this->signs.ForceRebuild();
this->BuildSignsList();
this->SetWidgetDirty(SLW_CAPTION);
this->vscroll->SetCount(this->signs.Length());
} else { // Change of sign contents while there is no filter string
this->signs.ForceResort();
}
this->SortSignsList();
}
static Hotkey<SignListWindow> signlist_hotkeys[];