libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 01:57:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed drawing of the caret. (It was drawn using the GUI font, rather than

Browse Source 
the widget's font.)

svn-id: r18130
This commit is contained in:
Torbjörn Andersson 2005-05-16 13:43:31 +00:00
parent 9a17302f57
commit c64467af1a
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/ListWidget.h
View File

@ -57,7 +57,6 @@ protected:
ScrollBarWidget *_scrollBar;
int _currentKeyDown;
int _lineHeight;
const Graphics::Font *_font;
String _quickSelectStr;
uint32 _quickSelectTime;

20
gui/editable.cpp
View File

@ -34,6 +34,8 @@ EditableWidget::EditableWidget(GuiObject *boss, int x, int y, int w, int h)
_caretInverse = false;
_editScrollOffset = 0;
_font = &(g_gui.getFont()); // Most widgets will probably set this to something else.
}
EditableWidget::~EditableWidget() {
@ -45,7 +47,7 @@ void EditableWidget::setEditString(const String &str) {
_editString = str;
_caretPos = _editString.size();
_editScrollOffset = (g_gui.getStringWidth(_editString) - (getEditRect().width()));
_editScrollOffset = (_font->getStringWidth(_editString) - (getEditRect().width()));
if (_editScrollOffset < 0)
_editScrollOffset = 0;
}
@ -130,7 +132,7 @@ bool EditableWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
int EditableWidget::getCaretOffset() const {
int caretpos = 0;
for (int i = 0; i < _caretPos; i++)
caretpos += g_gui.getCharWidth(_editString[i]);
caretpos += _font->getCharWidth(_editString[i]);
caretpos -= _editScrollOffset;
@ -142,20 +144,22 @@ void EditableWidget::drawCaret(bool erase) {
if (!isVisible() || !_boss->isVisible())
return;
Common::Rect editRect = getEditRect();
int16 color = (erase ^ _caretInverse) ? g_gui._bgcolor : g_gui._textcolorhi;
int x = getEditRect().left;
int y = getEditRect().top;
int x = editRect.left;
int y = editRect.top;
x += getCaretOffset();
if (y < 0 || y + kLineHeight >= _h)
if (y < 0 || y + editRect.height() >= _h)
return;
x += getAbsX();
y += getAbsY();
g_gui.vLine(x, y, y + kLineHeight, color);
g_gui.addDirtyRect(x, y, 2, kLineHeight);
g_gui.vLine(x, y, y + editRect.height(), color);
g_gui.addDirtyRect(x, y, 2, editRect.height());
_caretVisible = !erase;
}
@ -182,7 +186,7 @@ bool EditableWidget::adjustOffset() {
_editScrollOffset -= (editWidth - caretpos);
return true;
} else if (_editScrollOffset > 0) {
const int strWidth = g_gui.getStringWidth(_editString);
const int strWidth = _font->getStringWidth(_editString);
if (strWidth - _editScrollOffset < editWidth) {
// scroll right
_editScrollOffset = (strWidth - editWidth);

1
gui/editable.h
View File

@ -35,6 +35,7 @@ class EditableWidget : public Widget {
public:
typedef Common::String String;
protected:
const Graphics::Font *_font;
String _editString;
bool _caretVisible;