|
@@ -260,11 +260,13 @@ struct NewsWindow : Window {
|
|
|
uint16 chat_height; ///< Height of the chat window.
|
|
|
uint16 status_height; ///< Height of the status bar window
|
|
|
const NewsItem *ni; ///< News item to display.
|
|
|
static uint duration; ///< Remaining time for showing current news message (may only be accessed while a news item is displayed).
|
|
|
static int duration; ///< Remaining time for showing the current news message (may only be access while a news item is displayed).
|
|
|
|
|
|
uint timer;
|
|
|
|
|
|
NewsWindow(WindowDesc *desc, const NewsItem *ni) : Window(desc), ni(ni)
|
|
|
{
|
|
|
NewsWindow::duration = 555;
|
|
|
NewsWindow::duration = 16650;
|
|
|
const Window *w = FindWindowByClass(WC_SEND_NETWORK_MSG);
|
|
|
this->chat_height = (w != NULL) ? w->height : 0;
|
|
|
this->status_height = FindWindowById(WC_STATUS_BAR, 0)->height;
|
|
@@ -485,11 +487,18 @@ struct NewsWindow : Window {
|
|
|
this->SetWindowTop(newtop);
|
|
|
}
|
|
|
|
|
|
virtual void OnTick()
|
|
|
virtual void OnRealtimeTick(uint delta_ms)
|
|
|
{
|
|
|
/* Scroll up newsmessages from the bottom in steps of 4 pixels */
|
|
|
int newtop = max(this->top - 4, _screen.height - this->height - this->status_height - this->chat_height);
|
|
|
this->SetWindowTop(newtop);
|
|
|
int count = CountIntervalElapsed(this->timer, delta_ms, 15);
|
|
|
if (count > 0) {
|
|
|
/* Scroll up newsmessages from the bottom */
|
|
|
int newtop = max(this->top - 2 * count, _screen.height - this->height - this->status_height - this->chat_height);
|
|
|
this->SetWindowTop(newtop);
|
|
|
}
|
|
|
|
|
|
/* Decrement the news timer. We don't need to action an elapsed event here,
|
|
|
* so no need to use TimerElapsed(). */
|
|
|
if (NewsWindow::duration > 0) NewsWindow::duration -= delta_ms;
|
|
|
}
|
|
|
|
|
|
private:
|
|
@@ -536,7 +545,7 @@ private:
|
|
|
}
|
|
|
};
|
|
|
|
|
|
/* static */ uint NewsWindow::duration = 0; // Instance creation.
|
|
|
/* static */ int NewsWindow::duration = 0; // Instance creation.
|
|
|
|
|
|
|
|
|
/** Open up an own newspaper window for the news item */
|
|
@@ -588,11 +597,8 @@ static bool ReadyForNextItem()
|
|
|
* Check if the status bar message is still being displayed? */
|
|
|
if (IsNewsTickerShown()) return false;
|
|
|
|
|
|
/* Newspaper message, decrement duration counter */
|
|
|
if (NewsWindow::duration != 0) NewsWindow::duration--;
|
|
|
|
|
|
/* neither newsticker nor newspaper are running */
|
|
|
return (NewsWindow::duration == 0 || FindWindowById(WC_NEWS_WINDOW, 0) == NULL);
|
|
|
return (NewsWindow::duration <= 0 || FindWindowById(WC_NEWS_WINDOW, 0) == NULL);
|
|
|
}
|
|
|
|
|
|
/** Move to the next news item */
|