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

Reorganized GUI buttons #439

Browse source
This commit is contained in:
Dimitris Panokostas 2019-09-01 12:07:31 +02:00
parent 5db0ee5de6
commit 16d0220e3f
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/osdep/gui/Navigation.cpp
View file

@ -29,7 +29,7 @@ static NavigationMap navMap[] =
{
// active move left move right move up move down
// main_window
{ "About", "", "", "Reset", "Paths" },
{ "About", "", "", "Shutdown", "Paths" },
{ "Paths", "SystemROMs", "SystemROMs", "About", "Quickstart" },
{ "Quickstart", "qsNTSC", "qscboAModel", "Paths", "Configurations" },
{ "Configurations", "ConfigList", "ConfigList", "Quickstart", "CPU and FPU" },
@ -46,18 +46,19 @@ static NavigationMap navMap[] =
{ "Miscellaneous", "StatusLine", "StatusLine", "Custom controls", "Savestates" },
#ifdef ANDROIDSDL
{ "Savestates", "State0", "State0", "Miscellaneous", "OnScreen" },
{ "OnScreen", "OnScrButton3", "OnScrCtrl", "Savestates", "Reset" },
{ "Reset", "Start", "Quit", "OnScreen", "Paths" },
{ "Quit", "Reset", "Help", "OnScreen", "Paths" },
{ "OnScreen", "OnScrButton3", "OnScrCtrl", "Savestates", "Shutdown" },
{ "Shutdown", "Start", "Quit", "OnScreen", "Paths" },
{ "Quit", "Shutdown", "Help", "OnScreen", "Paths" },
{ "Help", "Quit", "Start", "OnScreen", "Paths" },
{ "Start", "Help", "Reset", "OnScreen", "Paths" },
{ "Start", "Help", "Shutdown", "OnScreen", "Paths" },
#else
{ "Savestates", "State0", "State0", "Miscellaneous", "Reset" },
{ "Reset", "Start", "Quit", "Savestates", "Paths" },
{ "Quit", "Reset", "Shutdown", "Savestates", "Paths" },
{ "Shutdown", "Quit", "Help", "Savestates", "Paths" },
{ "Help", "Shutdown", "Start", "Savestates", "Paths" },
{ "Start", "Help", "Reset", "Savestates", "Paths" },
{ "Savestates", "State0", "State0", "Miscellaneous", "Shutdown" },
{ "Shutdown", "Start", "Quit", "Savestates", "Paths" },
{ "Quit", "Shutdown", "Restart", "Savestates", "Paths" },
{ "Restart", "Quit", "Help", "Savestates", "Paths" },
{ "Help", "Restart", "Reset", "Savestates", "Paths" },
{ "Reset", "Help", "Start", "Savestates", "Paths" },
{ "Start", "Reset", "Shutdown", "Savestates", "Paths" },
#endif
// PanelPaths
@ -325,7 +326,7 @@ static NavigationMap navMap[] =
{ "OnScrButton2", "OnScreen", "CustomPos", "OnScrButton1", "FloatJoy" },
{ "CustomPos", "OnScrButton2", "OnScreen", "OnScrButton6", "Reset" },
{ "FloatJoy", "OnScreen", "CustomPos", "OnScrButton2", "DisableMenuVKeyb" },
{ "DisableMenuVKeyb","OnScreen", "CustomPos", "FloatJoy", "Reset" },
{ "DisableMenuVKeyb","OnScreen", "CustomPos", "FloatJoy", "Shutdown" },
#endif
// active move left move right move up move down

6
src/osdep/gui/main_window.cpp
View file

@ -1006,11 +1006,11 @@ namespace widgets
//--------------------------------------------------
// Place everything on main form
//--------------------------------------------------
gui_top->add(cmdReset, DISTANCE_BORDER, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdShutdown, DISTANCE_BORDER, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdQuit, DISTANCE_BORDER + BUTTON_WIDTH + DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdShutdown, DISTANCE_BORDER + 2 * BUTTON_WIDTH + 2 * DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdRestart, DISTANCE_BORDER + 2 * BUTTON_WIDTH + 2 * DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdHelp, DISTANCE_BORDER + 3 * BUTTON_WIDTH + 3 * DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdRestart, DISTANCE_BORDER + 5 * BUTTON_WIDTH + 5 * DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdReset, DISTANCE_BORDER + 5 * BUTTON_WIDTH + 5 * DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(cmdStart, GUI_WIDTH - DISTANCE_BORDER - BUTTON_WIDTH, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
gui_top->add(selectors, DISTANCE_BORDER + 1, DISTANCE_BORDER + 1);