Merge branch 'master' into tracerestrict

Conflicts:
	src/pathfinder/yapf/yapf_costrail.hpp
This commit is contained in:
Jonathan G Rennison
2015-08-15 00:28:14 +01:00
83 changed files with 7009 additions and 1003 deletions

View File

@@ -826,7 +826,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;
}