Merge branch 'master' into jgrpp
# Conflicts: # CMakeLists.txt # COMPILING.md # src/console.cpp # src/console_cmds.cpp # src/console_internal.h # src/rev.cpp.in
This commit is contained in:
@@ -422,7 +422,7 @@ struct NewsWindow : Window {
|
||||
{
|
||||
switch (widget) {
|
||||
case WID_N_CAPTION:
|
||||
DrawCaption(r, COLOUR_LIGHT_BLUE, this->owner, STR_NEWS_MESSAGE_CAPTION);
|
||||
DrawCaption(r, COLOUR_LIGHT_BLUE, this->owner, TC_FROMSTRING, STR_NEWS_MESSAGE_CAPTION, SA_HOR_CENTER);
|
||||
break;
|
||||
|
||||
case WID_N_PANEL:
|
||||
@@ -1205,7 +1205,7 @@ struct MessageHistoryWindow : Window {
|
||||
NewsItem *ni = _latest_news;
|
||||
if (ni == nullptr) return;
|
||||
|
||||
for (int n = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_MH_BACKGROUND, WD_FRAMERECT_TOP, this->line_height); n > 0; n--) {
|
||||
for (int n = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_MH_BACKGROUND, WD_FRAMERECT_TOP); n > 0; n--) {
|
||||
ni = ni->prev;
|
||||
if (ni == nullptr) return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user