Fixed a crash when opening the start menu.

Fixed PAGEDOWN/PAGEUP not appearing in the input config GUI.
Fixed PAGEDOWN/PAGEUP not properly updating detail data.
This commit is contained in:
Aloshi 2012-12-08 12:55:54 -06:00
parent 8a3eefcffc
commit 3acbd0af9c
3 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,8 @@
December 8, 2012
-Fixed a segfault when opening the menu (related to sounds). Woops!
-Fixed PAGEDOWN/PAGEUP not appearing in the input config GUI.
-Fixed PAGEDOWN/PAGEUP not properly clearing/updating detail data.
November 19 November 19
-Added Arch Linux's DejaVuSeriff.ttf path to the list of fonts to check for. -Added Arch Linux's DejaVuSeriff.ttf path to the list of fonts to check for.

View file

@ -176,7 +176,7 @@ void GuiGameList::onInput(InputManager::InputButton button, bool keyDown)
if(mDetailed) if(mDetailed)
{ {
if(button == InputManager::UP || button == InputManager::DOWN) if(button == InputManager::UP || button == InputManager::DOWN || button == InputManager::PAGEUP || button == InputManager::PAGEDOWN)
{ {
if(!keyDown) if(!keyDown)
updateDetailData(); updateDetailData();
@ -274,7 +274,7 @@ void GuiGameList::clearDetailData()
void GuiGameList::onPause() void GuiGameList::onPause()
{ {
mList->stopScrolling(); mList->stopScrolling();
mTheme->getSound("menuOpenSound")->play(); mTheme->getSound("menuOpen")->play();
InputManager::unregisterComponent(this); InputManager::unregisterComponent(this);
} }

View file

@ -5,7 +5,7 @@
std::string GuiInputConfig::sConfigPath = "./input.cfg"; std::string GuiInputConfig::sConfigPath = "./input.cfg";
std::string GuiInputConfig::sInputs[] = { "UNKNOWN", "UP", "DOWN", "LEFT", "RIGHT", "BUTTON1 (Accept)", "BUTTON2 (Back)", "START (Menu)", "SELECT (Jump-to-letter)", "PAGE UP", "PAGE DOWN" }; //must be same order as InputManager::InputButton enum; only add to the end to preserve backwards compatibility std::string GuiInputConfig::sInputs[] = { "UNKNOWN", "UP", "DOWN", "LEFT", "RIGHT", "BUTTON1 (Accept)", "BUTTON2 (Back)", "START (Menu)", "SELECT (Jump-to-letter)", "PAGE UP", "PAGE DOWN" }; //must be same order as InputManager::InputButton enum; only add to the end to preserve backwards compatibility
int GuiInputConfig::sInputCount = 9; int GuiInputConfig::sInputCount = 11;
GuiInputConfig::GuiInputConfig() GuiInputConfig::GuiInputConfig()
{ {