[Scummvm-cvs-logs] CVS: scummvm/gui EditTextWidget.cpp,1.32,1.33 ListWidget.cpp,1.52,1.53 ListWidget.h,1.32,1.33 editable.cpp,1.5,1.6 editable.h,1.4,1.5
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Fri Jun 3 04:33:47 CEST 2005
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11490
Modified Files:
EditTextWidget.cpp ListWidget.cpp ListWidget.h editable.cpp
editable.h
Log Message:
Cleanup.
Index: EditTextWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- EditTextWidget.cpp 20 May 2005 15:03:25 -0000 1.32
+++ EditTextWidget.cpp 3 Jun 2005 11:33:14 -0000 1.33
@@ -50,7 +50,7 @@
uint i;
for (i = 0; i < _editString.size(); ++i) {
- width += _font->getCharWidth(_editString[i]);
+ width += g_gui.getCharWidth(_editString[i]);
if (width >= x)
break;
}
@@ -68,7 +68,7 @@
// Draw the text
adjustOffset();
- g_gui.drawString(_font, _editString, _x + 2, _y + 2, getEditRect().width(), g_gui._textcolor, kTextAlignLeft, -_editScrollOffset, false);
+ g_gui.drawString(_editString, _x + 2, _y + 2, getEditRect().width(), g_gui._textcolor, kTextAlignLeft, -_editScrollOffset, false);
}
Common::Rect EditTextWidget::getEditRect() const {
Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ListWidget.cpp 20 May 2005 15:03:25 -0000 1.52
+++ ListWidget.cpp 3 Jun 2005 11:33:14 -0000 1.53
@@ -35,13 +35,12 @@
} else {
_w = w - kNormalScrollBarWidth;
}
- _lineHeight = _font->getFontHeight() + 2;
_flags = WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS | WIDGET_WANT_TICKLE;
_type = kListWidget;
_editMode = false;
_numberingMode = kListNumberingOne;
- _entriesPerPage = (_h - 2) / _lineHeight;
+ _entriesPerPage = (_h - 2) / kLineHeight;
_currentPos = 0;
_selectedItem = -1;
_scrollBar = new ScrollBarWidget(boss, _x + _w, _y, (ws == kBigWidgetSize ? kBigScrollBarWidth : kNormalScrollBarWidth), _h);
@@ -152,7 +151,7 @@
int ListWidget::findItem(int x, int y) const {
- return (y - 1) / _lineHeight + _currentPos;
+ return (y - 1) / kLineHeight + _currentPos;
}
static int matchingCharsIgnoringCase(const char *x, const char *y, bool &stop) {
@@ -300,7 +299,6 @@
int i, pos, len = _list.size();
Common::String buffer;
int deltax;
- Graphics::Surface *surf = &g_gui.getScreen();
// Draw a thin frame around the list.
gui->hLine(_x, _y, _x + _w - 1, gui->_color);
@@ -310,14 +308,14 @@
// Draw the list items
for (i = 0, pos = _currentPos; i < _entriesPerPage && pos < len; i++, pos++) {
const OverlayColor textColor = (_selectedItem == pos && _hasFocus) ? gui->_bgcolor : gui->_textcolor;
- const int y = _y + 2 + _lineHeight * i;
+ const int y = _y + 2 + kLineHeight * i;
// Draw the selected item inverted, on a highlighted background.
if (_selectedItem == pos) {
if (_hasFocus)
- gui->fillRect(_x + 1, _y + 1 + _lineHeight * i, _w - 1, _lineHeight, gui->_textcolorhi);
+ gui->fillRect(_x + 1, _y + 1 + kLineHeight * i, _w - 1, kLineHeight, gui->_textcolorhi);
else
- gui->frameRect(_x + 1, _y + 1 + _lineHeight * i, _w - 1, _lineHeight, gui->_textcolorhi);
+ gui->frameRect(_x + 1, _y + 1 + kLineHeight * i, _w - 1, kLineHeight, gui->_textcolorhi);
}
// If in numbering mode, we first print a number prefix
@@ -325,7 +323,7 @@
char temp[10];
sprintf(temp, "%2d. ", (pos + _numberingMode));
buffer = temp;
- _font->drawString(surf, buffer, _x + 2, y, _w - 4, textColor);
+ gui->drawString(buffer, _x + 2, y, _w - 4, textColor);
}
Common::Rect r(getEditRect());
@@ -335,18 +333,18 @@
adjustOffset();
deltax = -_editScrollOffset;
- _font->drawString(surf, buffer, _x + r.left, y, r.width(), textColor, kTextAlignLeft, deltax, false);
+ gui->drawString(buffer, _x + r.left, y, r.width(), textColor, kTextAlignLeft, deltax, false);
} else {
buffer = _list[pos];
deltax = 0;
- _font->drawString(surf, buffer, _x + r.left, y, r.width(), textColor);
+ gui->drawString(buffer, _x + r.left, y, r.width(), textColor);
}
}
}
Common::Rect ListWidget::getEditRect() const {
- Common::Rect r(2, 1, _w - 2 , _lineHeight);
- const int offset = (_selectedItem - _currentPos) * _lineHeight;
+ Common::Rect r(2, 1, _w - 2 , kLineHeight);
+ const int offset = (_selectedItem - _currentPos) * kLineHeight;
r.top += offset;
r.bottom += offset;
@@ -354,7 +352,7 @@
char temp[10];
// FIXME: Assumes that all digits have the same width.
sprintf(temp, "%2d. ", (_list.size() - 1 + _numberingMode));
- r.left += _font->getStringWidth(temp);
+ r.left += g_gui.getStringWidth(temp);
}
return r;
Index: ListWidget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ListWidget.h 16 May 2005 13:43:30 -0000 1.32
+++ ListWidget.h 3 Jun 2005 11:33:15 -0000 1.33
@@ -56,7 +56,6 @@
int _selectedItem;
ScrollBarWidget *_scrollBar;
int _currentKeyDown;
- int _lineHeight;
String _quickSelectStr;
uint32 _quickSelectTime;
Index: editable.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/editable.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- editable.cpp 20 May 2005 15:03:25 -0000 1.5
+++ editable.cpp 3 Jun 2005 11:33:15 -0000 1.6
@@ -34,18 +34,6 @@
_caretInverse = false;
_editScrollOffset = 0;
-
- switch (ws) {
- case kNormalWidgetSize:
- _font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
- break;
- case kBigWidgetSize:
- _font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont);
- break;
- default:
- _font = &g_gui.getFont();
- break;
- }
}
EditableWidget::~EditableWidget() {
@@ -57,7 +45,7 @@
_editString = str;
_caretPos = _editString.size();
- _editScrollOffset = (_font->getStringWidth(_editString) - (getEditRect().width()));
+ _editScrollOffset = (g_gui.getStringWidth(_editString) - (getEditRect().width()));
if (_editScrollOffset < 0)
_editScrollOffset = 0;
}
@@ -142,7 +130,7 @@
int EditableWidget::getCaretOffset() const {
int caretpos = 0;
for (int i = 0; i < _caretPos; i++)
- caretpos += _font->getCharWidth(_editString[i]);
+ caretpos += g_gui.getCharWidth(_editString[i]);
caretpos -= _editScrollOffset;
@@ -196,7 +184,7 @@
_editScrollOffset -= (editWidth - caretpos);
return true;
} else if (_editScrollOffset > 0) {
- const int strWidth = _font->getStringWidth(_editString);
+ const int strWidth = g_gui.getStringWidth(_editString);
if (strWidth - _editScrollOffset < editWidth) {
// scroll right
_editScrollOffset = (strWidth - editWidth);
Index: editable.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/editable.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- editable.h 20 May 2005 15:03:25 -0000 1.4
+++ editable.h 3 Jun 2005 11:33:15 -0000 1.5
@@ -35,7 +35,6 @@
public:
typedef Common::String String;
protected:
- const Graphics::Font *_font;
String _editString;
bool _caretVisible;
More information about the Scummvm-git-logs
mailing list