thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Do not draw text outside edit rect in EditableWidget.

Browse source
This commit is contained in:
Johannes Schickel 2013-11-24 00:49:18 +01:00
parent b487c1fc38
commit fe7f28bf6c
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gui/widgets/editable.cpp
View file

@ -261,7 +261,8 @@ void EditableWidget::drawCaret(bool erase) {
int x = editRect.left; int x = editRect.left;
int y = editRect.top; int y = editRect.top;
x += getCaretOffset(); const int caretOffset = getCaretOffset();
x += caretOffset;
if (y < 0 || y + editRect.height() > _h) if (y < 0 || y + editRect.height() > _h)
return; return;
@ -290,8 +291,17 @@ void EditableWidget::drawCaret(bool erase) {
character = " "; character = " ";
} }
// TODO: Right now we manually prevent text from being drawn outside
// the edit area here. We might want to consider to use
// setTextDrawableArea for this. However, it seems that only
// EditTextWidget uses that but not ListWidget. Thus, one should check
// whether we can unify the drawing in the text area first to avoid
// possible glitches due to different methods used.
width = MIN(editRect.width() - caretOffset, width);
if (width > 0) {
g_gui.theme()->drawText(Common::Rect(x, y, x + width, y + editRect.height()), character, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font, ThemeEngine::kFontColorNormal, true, _textDrawableArea); g_gui.theme()->drawText(Common::Rect(x, y, x + width, y + editRect.height()), character, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font, ThemeEngine::kFontColorNormal, true, _textDrawableArea);
} }
}
_caretVisible = !erase; _caretVisible = !erase;
} }