gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-08 23:19:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17176) -Codechange: Move widget state updating out of OnPaint method of message options window.

Browse Source
This commit is contained in:
alberth 2009-08-14 21:33:30 +00:00
parent e6a1da11a3
commit 3d38744b9f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/news_gui.cpp
View File

@ -955,6 +955,7 @@ struct MessageOptionsWindow : Window {
} }
/* If all values are the same value, the ALL-button will take over this value */ /* If all values are the same value, the ALL-button will take over this value */
this->state = all_val; this->state = all_val;
this->OnInvalidateData(0);
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);
} }
@ -977,9 +978,6 @@ struct MessageOptionsWindow : Window {
virtual void OnPaint() virtual void OnPaint()
{ {
if (_news_ticker_sound) this->LowerWidget(WIDGET_NEWSOPT_SOUNDTICKER);
this->widget[WIDGET_NEWSOPT_DROP_SUMMARY].data = this->message_opt[this->state];
this->DrawWidgets(); this->DrawWidgets();
/* Draw the string of each setting on each button. */ /* Draw the string of each setting on each button. */
@ -989,6 +987,14 @@ struct MessageOptionsWindow : Window {
} }
} }
virtual void OnInvalidateData(int data)
{
/* Update the dropdown value for 'set all categories'. */
this->widget[WIDGET_NEWSOPT_DROP_SUMMARY].data = this->message_opt[this->state];
/* Update widget to reflect the value of the #_news_ticker_sound variable. */
this->SetWidgetLoweredState(WIDGET_NEWSOPT_SOUNDTICKER, _news_ticker_sound);
}
virtual void OnClick(Point pt, int widget) virtual void OnClick(Point pt, int widget)
{ {
switch (widget) { switch (widget) {
@ -998,7 +1004,7 @@ struct MessageOptionsWindow : Window {
case WIDGET_NEWSOPT_SOUNDTICKER: // Change ticker sound on/off case WIDGET_NEWSOPT_SOUNDTICKER: // Change ticker sound on/off
_news_ticker_sound ^= 1; _news_ticker_sound ^= 1;
this->ToggleWidgetLoweredState(widget); this->OnInvalidateData(0);
this->InvalidateWidget(widget); this->InvalidateWidget(widget);
break; break;
@ -1025,6 +1031,7 @@ struct MessageOptionsWindow : Window {
this->SetMessageButtonStates(index, i); this->SetMessageButtonStates(index, i);
_news_type_data[i].display = (NewsDisplay)index; _news_type_data[i].display = (NewsDisplay)index;
} }
this->OnInvalidateData(0);
this->SetDirty(); this->SetDirty();
} }
}; };