libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Remove GuiObject::getMillis()

Browse Source 
svn-id: r48241
This commit is contained in:
Max Horn 2010-03-11 23:41:28 +00:00
parent 6e78fdc161
commit 4fc8ebab01
8 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/scumm/dialogs.cpp
View File

@ -674,7 +674,7 @@ void ValueDisplayDialog::drawDialog() {
}
void ValueDisplayDialog::handleTickle() {
if (getMillis() > _timer) {
if (g_system->getMillis() > _timer) {
close();
}
}
@ -702,7 +702,7 @@ void ValueDisplayDialog::handleKeyDown(Common::KeyState state) {
_value--;
setResult(_value);
_timer = getMillis() + kDisplayDelay;
_timer = g_system->getMillis() + kDisplayDelay;
draw();
} else {
close();
@ -712,7 +712,7 @@ void ValueDisplayDialog::handleKeyDown(Common::KeyState state) {
void ValueDisplayDialog::open() {
GUI_Dialog::open();
setResult(_value);
_timer = getMillis() + kDisplayDelay;
_timer = g_system->getMillis() + kDisplayDelay;
}
SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value)
@ -722,7 +722,7 @@ SubtitleSettingsDialog::SubtitleSettingsDialog(ScummEngine *scumm, int value)
void SubtitleSettingsDialog::handleTickle() {
InfoDialog::handleTickle();
if (getMillis() > _timer)
if (g_system->getMillis() > _timer)
close();
}
@ -759,7 +759,7 @@ void SubtitleSettingsDialog::cycleValue() {
else
setInfoText(subtitleDesc[_value]);
_timer = getMillis() + 1500;
_timer = g_system->getMillis() + 1500;
}
Indy3IQPointsDialog::Indy3IQPointsDialog(ScummEngine *scumm, char* text)

2
gui/ListWidget.cpp
View File

@ -290,7 +290,7 @@ bool ListWidget::handleKeyDown(Common::KeyState state) {
// Quick selection mode: Go to first list item starting with this key
// (or a substring accumulated from the last couple key presses).
// Only works in a useful fashion if the list entries are sorted.
uint32 time = getMillis();
uint32 time = g_system->getMillis();
if (_quickSelectTime < time) {
_quickSelectStr = (char)state.ascii;
} else {

4
gui/PopUpWidget.cpp
View File

@ -170,7 +170,7 @@ void PopUpDialog::drawDialog() {
if (_openTime == 0) {
// Time the popup was opened
_openTime = getMillis();
_openTime = g_system->getMillis();
}
}
@ -178,7 +178,7 @@ void PopUpDialog::handleMouseUp(int x, int y, int button, int clickCount) {
// Mouse was released. If it wasn't moved much since the original mouse down,
// let the popup stay open. If it did move, assume the user made his selection.
int dist = (_clickX - x) * (_clickX - x) + (_clickY - y) * (_clickY - y);
if (dist > 3 * 3 || getMillis() - _openTime > 300) {
if (dist > 3 * 3 || g_system->getMillis() - _openTime > 300) {
setResult(_selection);
close();
}

4
gui/about.cpp
View File

@ -175,7 +175,7 @@ void AboutDialog::addLine(const char *str) {
void AboutDialog::open() {
_scrollTime = getMillis() + kScrollStartDelay;
_scrollTime = g_system->getMillis() + kScrollStartDelay;
_scrollPos = 0;
_willClose = false;
@ -253,7 +253,7 @@ void AboutDialog::drawDialog() {
}
void AboutDialog::handleTickle() {
const uint32 t = getMillis();
const uint32 t = g_system->getMillis();
int scrollOffset = ((int)t - (int)_scrollTime) / kScrollMillisPerPixel;
if (scrollOffset > 0) {
int modifiers = g_system->getEventManager()->getModifierState();

4
gui/editable.cpp
View File

@ -77,7 +77,7 @@ bool EditableWidget::tryInsertChar(byte c, int pos) {
}
void EditableWidget::handleTickle() {
uint32 time = getMillis();
uint32 time = g_system->getMillis();
if (_caretTime < time) {
_caretTime = time + kCaretBlinkTime;
drawCaret(_caretVisible);
@ -287,7 +287,7 @@ bool EditableWidget::adjustOffset() {
}
void EditableWidget::makeCaretVisible() {
_caretTime = getMillis() + kCaretBlinkTime;
_caretTime = g_system->getMillis() + kCaretBlinkTime;
_caretVisible = true;
drawCaret(false);
}

4
gui/message.cpp
View File

@ -110,12 +110,12 @@ void MessageDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data
TimedMessageDialog::TimedMessageDialog(const Common::String &message, uint32 duration)
: MessageDialog(message, 0, 0) {
_timer = getMillis() + duration;
_timer = g_system->getMillis() + duration;
}
void TimedMessageDialog::handleTickle() {
MessageDialog::handleTickle();
if (getMillis() > _timer)
if (g_system->getMillis() > _timer)
close();
}

4
gui/object.cpp
View File

@ -40,10 +40,6 @@ GuiObject::~GuiObject() {
_firstWidget = 0;
}
uint32 GuiObject::getMillis() {
return g_system->getMillis();
}
void GuiObject::reflowLayout() {
if (!_name.empty()) {
if (!g_gui.xmlEval()->getWidgetData(_name, _x, _y, _w, _h)) {

4
gui/object.h
View File

@ -86,10 +86,6 @@ public:
protected:
virtual void releaseFocus() = 0;
// Convenience alias for OSystem::getMillis().
// This is a bit hackish, of course :-).
uint32 getMillis();
};
} // End of namespace GUI