Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

This commit is contained in:
Jonathan G Rennison
2015-08-11 21:41:58 +01:00
54 changed files with 6143 additions and 355 deletions

View File

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