diff options
Diffstat (limited to 'src/news_gui.cpp')
| -rw-r--r-- | src/news_gui.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 3d8881b34..ea6cd07d9 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -951,9 +951,13 @@ struct MessageHistoryWindow : Window { int line_height; /// < Height of a single line in the news histoy window including spacing. int date_width; /// < Width needed for the date part. + Scrollbar *vscroll; + MessageHistoryWindow(const WindowDesc *desc) : Window() { - this->InitNested(desc); // Initializes 'this->line_height' and 'this->date_width'. + this->CreateNestedTree(desc); + this->vscroll = this->GetScrollbar(MHW_SCROLLBAR); + this->FinishInitNested(desc); // Initializes 'this->line_height' and 'this->date_width'. this->OnInvalidateData(0); } @@ -983,7 +987,7 @@ struct MessageHistoryWindow : Window { /* Find the first news item to display. */ NewsItem *ni = _latest_news; - for (int n = this->vscroll.GetPosition(); n > 0; n--) { + for (int n = this->vscroll->GetPosition(); n > 0; n--) { ni = ni->prev; if (ni == NULL) return; } @@ -995,7 +999,7 @@ struct MessageHistoryWindow : Window { uint date_right = rtl ? r.right - WD_FRAMERECT_RIGHT : r.left + WD_FRAMERECT_LEFT + this->date_width; uint news_left = rtl ? r.left + WD_FRAMERECT_LEFT : r.left + WD_FRAMERECT_LEFT + this->date_width + WD_FRAMERECT_RIGHT; uint news_right = rtl ? r.right - WD_FRAMERECT_RIGHT - this->date_width - WD_FRAMERECT_RIGHT : r.right - WD_FRAMERECT_RIGHT; - for (int n = this->vscroll.GetCapacity(); n > 0; n--) { + for (int n = this->vscroll->GetCapacity(); n > 0; n--) { SetDParam(0, ni->date); DrawString(date_left, date_right, y, STR_SHORT_DATE); @@ -1009,7 +1013,7 @@ struct MessageHistoryWindow : Window { virtual void OnInvalidateData(int data) { - this->vscroll.SetCount(_total_news); + this->vscroll->SetCount(_total_news); } virtual void OnClick(Point pt, int widget, int click_count) @@ -1018,7 +1022,7 @@ struct MessageHistoryWindow : Window { NewsItem *ni = _latest_news; if (ni == NULL) return; - for (int n = this->vscroll.GetScrolledRowFromWidget(pt.y, this, MHW_BACKGROUND, WD_FRAMERECT_TOP, this->line_height); n > 0; n--) { + for (int n = this->vscroll->GetScrolledRowFromWidget(pt.y, this, MHW_BACKGROUND, WD_FRAMERECT_TOP, this->line_height); n > 0; n--) { ni = ni->prev; if (ni == NULL) return; } @@ -1029,7 +1033,7 @@ struct MessageHistoryWindow : Window { virtual void OnResize() { - this->vscroll.SetCapacity(this->GetWidget<NWidgetBase>(MHW_BACKGROUND)->current_y / this->line_height); + this->vscroll->SetCapacity(this->GetWidget<NWidgetBase>(MHW_BACKGROUND)->current_y / this->line_height); } }; |