libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 06:41:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't track the modifier state, use the eventmanager instead (this also fixes bug #1657322, GUI: 'Mass Add' button text does not revert after mass add)

Browse Source 
svn-id: r26174
This commit is contained in:
Max Horn 2007-03-17 16:05:16 +00:00
parent b765e998f7
commit cfe7ecd6d9
4 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/about.cpp
View File

@ -23,6 +23,7 @@
#include "engines/engine.h"
#include "base/plugins.h"
#include "base/version.h"
#include "common/events.h"
#include "common/system.h"
#include "common/util.h"
#include "gui/about.h"
@ -64,7 +65,7 @@ static const char *gpl_text[] = {
AboutDialog::AboutDialog()
: Dialog(10, 20, 300, 174),
_scrollPos(0), _scrollTime(0), _modifiers(0), _willClose(false) {
_scrollPos(0), _scrollTime(0), _willClose(false) {
int i;
@ -184,7 +185,6 @@ void AboutDialog::addLine(const char *str) {
void AboutDialog::open() {
_scrollTime = getMillis() + kScrollStartDelay;
_scrollPos = 0;
_modifiers = 0;
_willClose = false;
Dialog::open();
@ -267,11 +267,13 @@ void AboutDialog::handleTickle() {
const uint32 t = getMillis();
int scrollOffset = ((int)t - (int)_scrollTime) / kScrollMillisPerPixel;
if (scrollOffset > 0) {
int modifiers = g_system->getEventManager()->getModifierState();
// Scroll faster when shift is pressed
if (_modifiers & OSystem::KBD_SHIFT)
if (modifiers & OSystem::KBD_SHIFT)
scrollOffset *= 4;
// Reverse scrolling when alt is pressed
if (_modifiers & OSystem::KBD_ALT)
if (modifiers & OSystem::KBD_ALT)
scrollOffset *= -1;
_scrollPos += scrollOffset;
_scrollTime = t;
@ -292,13 +294,11 @@ void AboutDialog::handleMouseUp(int x, int y, int button, int clickCount) {
}
void AboutDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
_modifiers = modifiers;
if (ascii)
_willClose = true;
}
void AboutDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
_modifiers = modifiers;
if (ascii && _willClose)
close();
}

1
gui/about.h
View File

@ -35,7 +35,6 @@ protected:
uint32 _scrollTime;
StringList _lines;
uint32 _lineHeight;
byte _modifiers;
bool _willClose;
int _xOff, _yOff;

33
gui/launcher.cpp
View File

@ -27,6 +27,7 @@
#include "base/version.h"
#include "common/config-manager.h"
#include "common/events.h"
#include "common/fs.h"
#include "common/util.h"
#include "common/system.h"
@ -479,7 +480,7 @@ void EditGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
#pragma mark -
LauncherDialog::LauncherDialog()
: Dialog(0, 0, 320, 200), _modifiers(0) {
: Dialog(0, 0, 320, 200) {
_drawingHints |= THEME_HINT_MAIN_DIALOG;
const int screenW = g_system->getOverlayWidth();
@ -561,6 +562,8 @@ void LauncherDialog::open() {
// re-launch the same game again.
ConfMan.setActiveDomain("");
Dialog::open();
updateButtons();
}
void LauncherDialog::close() {
@ -616,7 +619,8 @@ void LauncherDialog::updateListing() {
}
void LauncherDialog::addGame() {
bool massAdd = (_modifiers & OSystem::KBD_SHIFT) != 0;
int modifiers = g_system->getEventManager()->getModifierState();
bool massAdd = (modifiers & OSystem::KBD_SHIFT) != 0;
if (massAdd) {
MessageDialog alert("Do you really want to run the mass game detector? "
@ -792,23 +796,13 @@ void LauncherDialog::editGame(int item) {
}
void LauncherDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
_modifiers = modifiers;
Dialog::handleKeyDown(ascii, keycode, modifiers);
if ((modifiers & OSystem::KBD_SHIFT) != 0) {
_addButton->setLabel("Mass Add...");
_addButton->draw();
}
updateButtons();
}
void LauncherDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
_modifiers = modifiers;
Dialog::handleKeyUp(ascii, keycode, modifiers);
if ((modifiers & OSystem::KBD_SHIFT) == 0) {
_addButton->setLabel("Add Game...");
_addButton->draw();
}
updateButtons();
}
void LauncherDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
@ -869,6 +863,17 @@ void LauncherDialog::updateButtons() {
_removeButton->setEnabled(enable);
_removeButton->draw();
}
// Update the label of the "Add" button depending on whether shift is pressed or not
int modifiers = g_system->getEventManager()->getModifierState();
const char *newAddButtonLabel = ((modifiers & OSystem::KBD_SHIFT) != 0)
? "Mass Add..."
: "Add Game...";
if (_addButton->getLabel() != newAddButtonLabel) {
_addButton->setLabel(newAddButtonLabel);
_addButton->draw();
}
}
void LauncherDialog::reflowLayout() {

1
gui/launcher.h
View File

@ -58,7 +58,6 @@ protected:
#endif
StringList _domains;
BrowserDialog *_browser;
byte _modifiers;
virtual void reflowLayout();