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

Merge branch 'master' into enhanced_viewport_overlay

Browse Source 
Conflicts:
	src/road_gui.cpp
	src/widgets/dropdown.cpp
This commit is contained in:
Jonathan G Rennison
2015-08-11 21:41:41 +01:00
parent 5540374227 f4cd0198f4
commit 388dab7390
78 changed files with 6613 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/misc_gui.cpp
View File

@@ -831,7 +831,7 @@ Point QueryString::GetCaretPosition(const Window *w, int wid) const
int delta = min(0, (right - left) - tb->pixels - 10);
if (tb->caretxoffs + delta < 0) delta = -tb->caretxoffs;
Point pt = {left + WD_FRAMERECT_LEFT + tb->caretxoffs + delta, wi->pos_y + WD_FRAMERECT_TOP};
Point pt = {left + WD_FRAMERECT_LEFT + tb->caretxoffs + delta, (int)wi->pos_y + WD_FRAMERECT_TOP};
return pt;
}