pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18 from GrethTom/patch-3

Browse source 
Fix for Navigation of the GUI via arrow keys.
This commit is contained in:
Chips-fr 2016-06-18 16:17:46 +02:00 • committed by GitHub
commit 5de07e0360
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/od-pandora/gui/Navigation.cpp
View file

@ -40,9 +40,8 @@ static NavigationMap navMap[] =
{ "Miscellaneous", "Status Line", "Status Line", "Input", "Savestates" }, { "Miscellaneous", "Status Line", "Status Line", "Input", "Savestates" },
{ "Savestates", "State0", "State0", "Miscellaneous", "Reset" }, { "Savestates", "State0", "State0", "Miscellaneous", "Reset" },
{ "Reset", "Start", "Quit", "Savestates", "Paths" }, { "Reset", "Start", "Quit", "Savestates", "Paths" },
{ "Quit", "Reset", "Restart", "Savestates", "Paths" }, { "Quit", "Reset", "Start", "Savestates", "Paths" },
{ "Restart", "Quit", "Start", "Savestates", "Paths" }, { "Start", "Quit", "Reset", "Savestates", "Paths" },
{ "Start", "Restart", "Reset", "Savestates", "Paths" },
// PanelPaths // PanelPaths
{ "SystemROMs", "Paths", "Paths", "RescanROMs", "ConfigPath" }, { "SystemROMs", "Paths", "Paths", "RescanROMs", "ConfigPath" },
@ -147,11 +146,21 @@ static NavigationMap navMap[] =
{ "cmdAddHDF", "cmdAddDir", "cmdCreateHDF", "cmdDel4", "cmdDel0" }, { "cmdAddHDF", "cmdAddDir", "cmdCreateHDF", "cmdDel4", "cmdDel0" },
{ "cmdCreateHDF", "cmdAddHDF", "Hard drives", "cmdDel4", "cmdDel0" }, { "cmdCreateHDF", "cmdAddHDF", "Hard drives", "cmdDel4", "cmdDel0" },
#ifndef RASPBERRY
// PanelDisplay // PanelDisplay
{ "sldWidth", "", "", "Frameskip", "sldHeight" }, { "sldWidth", "Display", "", "Frameskip", "sldHeight" },
{ "sldHeight", "", "", "sldWidth", "sldVertPos" }, { "sldHeight", "Display", "", "sldWidth", "sldVertPos" },
{ "sldVertPos", "", "", "sldHeight", "Frameskip" }, { "sldVertPos", "Display", "", "sldHeight", "Frameskip" },
{ "Frameskip", "Display", "Display", "sldVertPos", "sldWidth" }, { "Frameskip", "Display", "Display", "sldVertPos", "sldWidth" },
#else
// PanelDisplay
{ "sldWidth", "Display", "", "Frameskip", "sldHeight" },
{ "sldHeight", "Display", "", "sldWidth", "sldVertPos" },
{ "sldVertPos", "Display", "", "sldHeight", "FSRatio" },
{ "FSRatio", "Display", "", "sldVertPos", "4by3Ratio" },
{ "4by3Ratio", "Display", "Display", "FSRatio", "Frameskip" },
{ "Frameskip", "Display", "Display", "4by3Ratio", "sldWidth" },
#endif
//PanelSound //PanelSound
{ "sndDisable", "Sound", "Mono", "sldStereoDelay", "sndDisEmu" }, { "sndDisable", "Sound", "Mono", "sldStereoDelay", "sndDisEmu" },
@ -166,6 +175,7 @@ static NavigationMap navMap[] =
{ "sldSeparation", "", "", "cboFilter", "sldStereoDelay" }, { "sldSeparation", "", "", "cboFilter", "sldStereoDelay" },
{ "sldStereoDelay", "", "", "sldSeparation", "sndDisable" }, { "sldStereoDelay", "", "", "sldSeparation", "sndDisable" },
#ifndef RASPBERRY
// PanelInput // PanelInput
{ "cboCtrlConfig", "Input", "Input", "cboLeft", "cboJoystick" }, { "cboCtrlConfig", "Input", "Input", "cboLeft", "cboJoystick" },
{ "cboJoystick", "Input", "cboAutofire", "cboCtrlConfig", "cboTapDelay" }, { "cboJoystick", "Input", "cboAutofire", "cboCtrlConfig", "cboTapDelay" },
@ -185,12 +195,30 @@ static NavigationMap navMap[] =
{ "cboDown", "cboUp", "Input", "cboR", "cboRight" }, { "cboDown", "cboUp", "Input", "cboR", "cboRight" },
{ "cboLeft", "Input", "cboRight", "cboUp", "cboCtrlConfig" }, { "cboLeft", "Input", "cboRight", "cboUp", "cboCtrlConfig" },
{ "cboRight", "cboLeft", "Input", "cboDown", "cboCtrlConfig" }, { "cboRight", "cboLeft", "Input", "cboDown", "cboCtrlConfig" },
#else
// PanelInput
{ "cboCtrlConfig", "Input", "Input", "cboLeft", "cboJoystick" },
{ "cboJoystick", "Input", "cboAutofire", "cboCtrlConfig", "MouseSpeed" },
{ "cboAutofire", "cboJoystick", "Input", "cboCtrlConfig", "MouseSpeed" },
{ "MouseSpeed", "", "", "cboJoystick", "cboDPAD" },
{ "cboDPAD", "Input", "CustomCtrl", "MouseSpeed", "cboA" },
{ "CustomCtrl", "cboDPAD", "Input", "MouseSpeed", "cboB" },
{ "cboA", "Input", "cboB", "cboDPAD", "cboX" },
{ "cboB", "cboA", "Input", "CustomCtrl", "cboY" },
{ "cboX", "Input", "cboY", "cboA", "cboL" },
{ "cboY", "cboX", "Input", "cboB", "cboR" },
{ "cboL", "Input", "cboR", "cboX", "cboUp" },
{ "cboR", "cboL", "Input", "cboY", "cboDown" },
{ "cboUp", "Input", "cboDown", "cboL", "cboLeft" },
{ "cboDown", "cboUp", "Input", "cboR", "cboRight" },
{ "cboLeft", "Input", "cboRight", "cboUp", "cboCtrlConfig" },
{ "cboRight", "cboLeft", "Input", "cboDown", "cboCtrlConfig" },
#endif
// PanelMisc // PanelMisc
{ "Status Line", "Miscellaneous", "Miscellaneous", "BSDSocket", "ShowGUI" }, { "Status Line", "Miscellaneous", "Miscellaneous", "BSDSocket", "ShowGUI" },
{ "ShowGUI", "Miscellaneous", "Miscellaneous", "Status Line", "PandSpeed" }, { "ShowGUI", "Miscellaneous", "Miscellaneous", "Status Line", "BSDSocket" },
{ "PandSpeed", "", "", "ShowGUI", "BSDSocket" }, { "BSDSocket", "Miscellaneous", "Miscellaneous", "ShowGUI", "Status Line" },
{ "BSDSocket", "Miscellaneous", "Miscellaneous", "PandSpeed", "Status Line" },
// PanelSavestate // PanelSavestate
{ "State0", "Savestates", "Savestates", "LoadState", "State1" }, { "State0", "Savestates", "Savestates", "LoadState", "State1" },

1
src/od-pandora/gui/PanelDisplay.cpp
View file

@ -150,6 +150,7 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
lblFSRatioInfo = new gcn::Label("100%%"); lblFSRatioInfo = new gcn::Label("100%%");
chkAspect = new gcn::UaeCheckBox("4/3 ratio shrink"); chkAspect = new gcn::UaeCheckBox("4/3 ratio shrink");
chkAspect->setId("4by3Ratio");
chkAspect->addActionListener(amigaScreenActionListener); chkAspect->addActionListener(amigaScreenActionListener);
#endif #endif