aboutsummaryrefslogtreecommitdiff
path: root/gui/widgets/editable.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-09-24 13:55:54 +0200
committerWillem Jan Palenstijn2013-09-24 13:55:54 +0200
commit6417192584873f98737a0928adefeb9aa9cad894 (patch)
tree0d238f05c406ae70fff8c907bd10d29a16f2d6a4 /gui/widgets/editable.cpp
parentf3514534ce46bad5e3ffadfdf0b3af403045e5ef (diff)
parent74cc4aec8aa80da2541857e3120b31a566ccdff3 (diff)
downloadscummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.gz
scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.bz2
scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.zip
Merge branch 'master' into zvision
Conflicts: video/avi_decoder.cpp
Diffstat (limited to 'gui/widgets/editable.cpp')
-rw-r--r--gui/widgets/editable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/widgets/editable.cpp b/gui/widgets/editable.cpp
index 6fae9346b2..667850d6cc 100644
--- a/gui/widgets/editable.cpp
+++ b/gui/widgets/editable.cpp
@@ -277,7 +277,7 @@ void EditableWidget::drawCaret(bool erase) {
int chrWidth = g_gui.getCharWidth(_editString[_caretPos], _font);
const uint last = (_caretPos > 0) ? _editString[_caretPos - 1] : 0;
x += g_gui.getKerningOffset(last, _editString[_caretPos], _font);
- g_gui.theme()->drawText(Common::Rect(x, y, x + chrWidth, y + editRect.height() - 2), chr, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font);
+ g_gui.theme()->drawText(Common::Rect(x, y, x + chrWidth, y + editRect.height() - 2), chr, _state, Graphics::kTextAlignLeft, _inversion, 0, false, _font, ThemeEngine::kFontColorNormal, true, _textDrawableArea);
}
}