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

Merge 1.9.0-beta2

Browse Source
This commit is contained in:
Pavel Stupnikov
2019-02-14 00:47:22 +03:00
parent c2d889eab3 2bda8d4f34
commit 6e2a54355a
1364 changed files with 22213 additions and 10721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/widget.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: widget.cpp 27893 2017-08-13 18:38:42Z frosch $ */
/* $Id$ */
/*
* This file is part of OpenTTD.
@@ -756,7 +756,7 @@ NWidgetBase::NWidgetBase(WidgetType tp) : ZeroedMemoryAllocator()
*/
/**
* @fn void FillNestedArray(NWidgetBase **array, uint length)
* @fn void NWidgetBase::FillNestedArray(NWidgetBase **array, uint length)
* Fill the Window::nested_array array with pointers to nested widgets in the tree.
* @param array Base pointer of the array.
* @param length Length of the array.
@@ -1674,10 +1674,10 @@ NWidgetCore *NWidgetMatrix::GetWidgetFromPos(int x, int y)
/**
* Get the different offsets that are influenced by scrolling.
* @param [out] start_x The start position in columns (index of the left-most column, swapped in RTL).
* @param [out] start_y The start position in rows.
* @param [out] base_offs_x The base horizontal offset in pixels (X position of the column \a start_x).
* @param [out] base_offs_y The base vertical offset in pixels (Y position of the column \a start_y).
* @param[out] start_x The start position in columns (index of the left-most column, swapped in RTL).
* @param[out] start_y The start position in rows.
* @param[out] base_offs_x The base horizontal offset in pixels (X position of the column \a start_x).
* @param[out] base_offs_y The base vertical offset in pixels (Y position of the column \a start_y).
*/
void NWidgetMatrix::GetScrollOffsets(int &start_x, int &start_y, int &base_offs_x, int &base_offs_y)
{
@@ -2806,7 +2806,7 @@ NWidgetContainer *MakeNWidgets(const NWidgetPart *parts, int count, int *biggest
* @param parts Array with parts of the widgets.
* @param count Length of the \a parts array.
* @param biggest_index Pointer to biggest nested widget index collected in the tree.
* @param [out] shade_select Pointer to the inserted shade selection widget (\c NULL if not unserted).
* @param[out] shade_select Pointer to the inserted shade selection widget (\c NULL if not unserted).
* @return Root of the nested widget tree, a vertical container containing the entire GUI.
* @ingroup NestedWidgetParts
* @pre \c biggest_index != NULL