miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openttd updated to 1.5.0-beta2

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2015-03-01 00:30:53 +03:00
parent 0abb47ce90
commit d201932121
682 changed files with 26103 additions and 16553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/statusbar_gui.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: statusbar_gui.cpp 25290 2013-05-26 19:25:01Z frosch $ */
/* $Id: statusbar_gui.cpp 27146 2015-02-13 21:13:45Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -24,6 +24,7 @@
#include "saveload/saveload.h"
#include "window_func.h"
#include "statusbar_gui.h"
#include "toolbar_gui.h"
#include "core/geometry_func.hpp"
#include "widgets/statusbar_widget.h"
@@ -31,6 +32,8 @@
#include "table/strings.h"
#include "table/sprites.h"
#include "safeguards.h"
static bool DrawScrollingStatusText(const NewsItem *ni, int scroll_pos, int left, int right, int top, int bottom)
{
CopyInDParam(0, ni->params, lengthof(ni->params));
@@ -99,6 +102,11 @@ struct StatusBarWindow : Window {
return pt;
}
virtual void FindWindowPlacementAndResize(int def_width, int def_height)
{
Window::FindWindowPlacementAndResize(_toolbar_width, def_height);
}
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
{
Dimension d;
@@ -236,7 +244,7 @@ static const NWidgetPart _nested_main_status_widgets[] = {
};
static WindowDesc _main_status_desc(
WDP_MANUAL, NULL, 640, 12,
WDP_MANUAL, NULL, 0, 0,
WC_STATUS_BAR, WC_NONE,
WDF_NO_FOCUS,
_nested_main_status_widgets, lengthof(_nested_main_status_widgets)