mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19921) -Fix [FS#3865]: closing chatbox could cause glitches when news message was shown

release/1.1
smatz 2010-06-04 09:47:55 +00:00
parent 6be760645a
commit c49436c2d1
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/news_gui.cpp
View File

@ -490,24 +490,35 @@ struct NewsWindow : Window {
virtual void OnInvalidateData(int data) virtual void OnInvalidateData(int data)
{ {
/* The chatbar has notified us that is was either created or closed */ /* The chatbar has notified us that is was either created or closed */
int newtop = this->top + this->chat_height - data;
this->chat_height = data; this->chat_height = data;
this->SetWindowTop(newtop);
} }
virtual void OnTick() virtual void OnTick()
{ {
/* Scroll up newsmessages from the bottom in steps of 4 pixels */ /* Scroll up newsmessages from the bottom in steps of 4 pixels */
int y = max(this->top - 4, _screen.height - this->height - this->status_height - this->chat_height); int newtop = max(this->top - 4, _screen.height - this->height - this->status_height - this->chat_height);
if (y == this->top) return; this->SetWindowTop(newtop);
if (this->viewport != NULL) this->viewport->top += y - this->top;
int diff = Delta(this->top, y);
this->top = y;
SetDirtyBlocks(this->left, this->top, this->left + this->width, this->top + this->height + diff);
} }
private: private:
/**
* Moves the window so #newtop is new 'top' coordinate. Makes screen dirty where needed.
* @param newtop new top coordinate
*/
void SetWindowTop(int newtop)
{
if (this->top == newtop) return;
int mintop = min(newtop, this->top);
int maxtop = max(newtop, this->top);
if (this->viewport != NULL) this->viewport->top += newtop - this->top;
this->top = newtop;
SetDirtyBlocks(this->left, mintop, this->left + this->width, maxtop + this->height);
}
StringID GetCompanyMessageString() const StringID GetCompanyMessageString() const
{ {
switch (this->ni->subtype) { switch (this->ni->subtype) {