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

Merge remote-tracking branch 'origin/master' into HEAD

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-04-23 18:16:24 +03:00
parent 0b340fd376 405eba8a38
commit 3ba683874b
179 changed files with 6418 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/signs_gui.cpp
View File

@@ -24,6 +24,7 @@
#include "sortlist_type.h"
#include "stringfilter_type.h"
#include "string_func.h"
#include "settings_type.h"
#include "core/geometry_func.hpp"
#include "hotkeys.h"
#include "transparency.h"
@@ -200,7 +201,7 @@ struct SignListWindow : Window, SignList {
{
switch (widget) {
case WID_SIL_LIST: {
uint y = r.top + WD_FRAMERECT_TOP; // Offset from top of widget.
uint y = Center(r.top + WD_FRAMERECT_TOP, this->resize.step_height); // Offset from top of widget.
/* No signs? */
if (this->vscroll->GetCount() == 0) {
DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_STATION_LIST_NONE);
@@ -271,13 +272,14 @@ struct SignListWindow : Window, SignList {
case WID_SIL_LIST: {
Dimension spr_dim = GetSpriteSize(SPR_COMPANY_ICON);
this->text_offset = WD_FRAMETEXT_LEFT + spr_dim.width + 2; // 2 pixels space between icon and the sign text.
resize->height = max<uint>(FONT_HEIGHT_NORMAL, spr_dim.height);
resize->height = max<uint>(GetMinSizing(NWST_STEP), spr_dim.height);
Dimension d = {(uint)(this->text_offset + WD_FRAMETEXT_RIGHT), WD_FRAMERECT_TOP + 5 * resize->height + WD_FRAMERECT_BOTTOM};
*size = maxdim(*size, d);
break;
}
case WID_SIL_CAPTION:
if (!_settings_client.gui.windows_titlebars) break;
SetDParamMaxValue(0, Sign::GetPoolSize(), 3);
*size = GetStringBoundingBox(STR_SIGN_LIST_CAPTION);
size->height += padding.height;