dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tracerestrict

Browse Source 
Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
This commit is contained in:
Jonathan G Rennison
2015-08-15 00:28:14 +01:00
parent 76707fb72a 8cfc1e9d23
commit 29c4f244f3
83 changed files with 7009 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/dropdown.cpp
View File

@@ -380,8 +380,8 @@ void ShowDropDownListAt(Window *w, const DropDownList *list, int selected, int b
if (auto_width) width = max(width, max_item_width);
Point dw_pos = { w->left + (_current_text_dir == TD_RTL ? wi_rect.right + 1 - width : wi_rect.left), top};
Dimension dw_size = {width, height};
Point dw_pos = { w->left + (_current_text_dir == TD_RTL ? wi_rect.right + 1 - (int)width : wi_rect.left), top};
Dimension dw_size = {width, (uint)height};
new DropdownWindow(w, list, selected, button, instant_close, dw_pos, dw_size, wi_colour, scroll);
}