xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add left and right arrow keys to move between setup pages and refactor callback functions to forward to member functions 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6916 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2020-04-12 20:18:02 +00:00
parent 7a3c2a34aa
commit 060d4eb8af
2 changed files with 129 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/modules/userinterface/legacymenu/racescreens/carsetupmenu.cpp
View File

@ -34,57 +34,130 @@ This file deals with car setup
#include "carsetupmenu.h"
void CarSetupMenu::onActivate(void *pMenu)
{
GfLogInfo("Entering Car Setup menu\n");
// callback functions
void CarSetupMenu::onActivateCallback(void *pMenu)
{
// Get the CarSetupMenu instance.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
pCarSetupMenu->onActivate();
}
void CarSetupMenu::onAcceptCallback(void *pMenu)
{
// Get the CarSetupMenu instance.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
pCarSetupMenu->onAccept();
}
void CarSetupMenu::onNextCallback(void *pMenu)
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
pCarSetupMenu->onNext();
}
void CarSetupMenu::onCancelCallback(void *pMenu)
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
pCarSetupMenu->onCancel();
}
void CarSetupMenu::onResetCallback(void *pMenu)
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
pCarSetupMenu->onReset();
}
void CarSetupMenu::onPreviousCallback(void *pMenu)
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
pCarSetupMenu->onPrevious();
}
// member functions
void CarSetupMenu::onActivate()
{
GfLogInfo("Entering Car Setup menu\n");
// Load settings from XML file.
pCarSetupMenu->loadSettings();
loadSettings();
// Initialize GUI from loaded values.
pCarSetupMenu->updateControls();
updateControls();
}
void CarSetupMenu::onAccept(void *pMenu)
void CarSetupMenu::onAccept()
{
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
// Get the current page values.
pCarSetupMenu->readCurrentPage();
readCurrentPage();
// Save all page values.
pCarSetupMenu->storeSettings();
storeSettings();
// Switch back to garage menu.
GfuiScreenActivate(pCarSetupMenu->getPreviousMenuHandle());
GfuiScreenActivate(getPreviousMenuHandle());
}
void CarSetupMenu::onCancel(void *pMenu)
void CarSetupMenu::onCancel()
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
// Back to previous screen.
GfuiScreenActivate(pCarSetupMenu->getPreviousMenuHandle());
GfuiScreenActivate(getPreviousMenuHandle());
}
void CarSetupMenu::onReset(void *pMenu)
void CarSetupMenu::onReset()
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
// Reset all values on current page to their defaults.
for (size_t index = 0; index < ITEMS_PER_PAGE; index++)
{
attnum &att = pCarSetupMenu->items[pCarSetupMenu->currentPage][index];
attnum &att = items[currentPage][index];
att.value = att.defaultValue;
}
// Update the GUI.
pCarSetupMenu->updateControls();
updateControls();
}
void CarSetupMenu::onPrevious()
{
// Check if first page.
if (currentPage == 0)
return;
// Get the current page values.
readCurrentPage();
// Switch to previous page.
currentPage--;
// Update the GUI.
updateControls();
}
void CarSetupMenu::onNext()
{
// Check if last page.
if (currentPage == (items.size() - 1))
return;
// Get the current page values.
readCurrentPage();
// Switch to next page.
currentPage++;
// update the GUI.
updateControls();
}
void CarSetupMenu::readCurrentPage()
@ -101,36 +174,6 @@ void CarSetupMenu::readCurrentPage()
}
}
void CarSetupMenu::onPrevious(void *pMenu)
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
// Get the current page values.
pCarSetupMenu->readCurrentPage();
// Switch to previous page.
pCarSetupMenu->currentPage--;
// Update the GUI.
pCarSetupMenu->updateControls();
}
void CarSetupMenu::onNext(void *pMenu)
{
// Get the CarSetupMenu instance from call-back user data.
CarSetupMenu *pCarSetupMenu = static_cast<CarSetupMenu*>(pMenu);
// Get the current page values.
pCarSetupMenu->readCurrentPage();
// Switch to next page.
pCarSetupMenu->currentPage++;
// update the GUI.
pCarSetupMenu->updateControls();
}
void CarSetupMenu::updateControls()
{
GfuiEnable(getMenuHandle(), getDynamicControlId("PreviousButton"), currentPage != 0 ? GFUI_ENABLE : GFUI_DISABLE);
@ -402,7 +445,7 @@ bool CarSetupMenu::initialize(void *pMenu, const GfRace *pRace, const GfDriver *
GfLogDebug("Initializing Car Setup menu: \"%s\"\n", pDriver->getCar()->getName().c_str());
createMenu(NULL, this, onActivate, NULL, (tfuiCallback)NULL, 1);
createMenu(NULL, this, onActivateCallback, NULL, (tfuiCallback)NULL, 1);
openXMLDescriptor();
@ -419,19 +462,21 @@ bool CarSetupMenu::initialize(void *pMenu, const GfRace *pRace, const GfDriver *
}
// Create buttons.
createButtonControl("ApplyButton", this, onAccept);
createButtonControl("CancelButton", this, onCancel);
createButtonControl("ResetButton", this, onReset);
createButtonControl("PreviousButton", this, onPrevious);
createButtonControl("NextButton", this, onNext);
createButtonControl("ApplyButton", this, onAcceptCallback);
createButtonControl("CancelButton", this, onCancelCallback);
createButtonControl("ResetButton", this, onResetCallback);
createButtonControl("PreviousButton", this, onPreviousCallback);
createButtonControl("NextButton", this, onNextCallback);
closeXMLDescriptor();
// Keyboard shortcuts.
addShortcut(GFUIK_ESCAPE, "Cancel", this, onCancel, NULL);
addShortcut(GFUIK_RETURN, "Accept", this, onAccept, NULL);
addShortcut(GFUIK_ESCAPE, "Cancel", this, onCancelCallback, NULL);
addShortcut(GFUIK_RETURN, "Accept", this, onAcceptCallback, NULL);
addShortcut(GFUIK_F1, "Help", getMenuHandle(), GfuiHelpScreen, NULL);
addShortcut(GFUIK_F12, "Screen-Shot", NULL, GfuiScreenShot, NULL);
addShortcut(GFUIK_LEFT, "Previous Page", this, onPreviousCallback, NULL);
addShortcut(GFUIK_RIGHT, "Next Page", this, onNextCallback, NULL);
return true;
}

43
src/modules/userinterface/legacymenu/racescreens/carsetupmenu.h
View File

@ -36,18 +36,18 @@ class CarSetupMenu : public GfuiMenuScreen
{
public:
CarSetupMenu();
bool initialize(void *pPrevMenu,
CarSetupMenu();
bool initialize(void *pPrevMenu,
const GfRace *pRace,
const GfDriver *pDriver);
void storeSettings();
void loadSettings();
void updateControls();
const GfCar *getCar() const { return _pDriver->getCar(); }
const GfTrack *getTrack() const { return _pRace->getTrack(); }
// callback functions must be static
static void onActivateCallback(void *pMenu);
static void onAcceptCallback(void *pMenu);
static void onCancelCallback(void *pMenu);
static void onResetCallback(void *pMenu);
static void onPreviousCallback(void *pMenu);
static void onNextCallback(void *pMenu);
struct attnum
{
@ -72,15 +72,22 @@ public:
}
};
protected:
private:
//callback functions must be static
static void onActivate(void *pMenu);
static void onAccept(void *pMenu);
static void onCancel(void *pMenu);
static void onReset(void *pMenu);
static void onPrevious(void *pMenu);
static void onNext(void *pMenu);
void storeSettings();
void loadSettings();
void updateControls();
void readCurrentPage();
const GfCar *getCar() const { return _pDriver->getCar(); }
const GfTrack *getTrack() const { return _pRace->getTrack(); }
void onActivate();
void onAccept();
void onCancel();
void onReset();
void onPrevious();
void onNext();
// The target race.
const GfRace *_pRace;
@ -88,8 +95,6 @@ protected:
// The target driver.
const GfDriver *_pDriver;
void readCurrentPage();
std::vector<std::array<attnum, ITEMS_PER_PAGE> > items;
size_t currentPage;
};