From 8c795fdeb95dfdb6ffb62f6d20d2101f983c92a2 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Fri, 14 Apr 2017 00:03:58 +0200 Subject: [PATCH] Fixed keyboard navigation in GUI (Display and Chipset areas) --- src/osdep/gui/Navigation.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/osdep/gui/Navigation.cpp b/src/osdep/gui/Navigation.cpp index 84d3b982..c05adf1b 100644 --- a/src/osdep/gui/Navigation.cpp +++ b/src/osdep/gui/Navigation.cpp @@ -26,12 +26,12 @@ static NavigationMap navMap[] = {"Paths", "SystemROMs", "SystemROMs", "Reset", "Configurations"}, {"Configurations", "ConfigList", "ConfigList", "Paths", "CPU and FPU"}, {"CPU and FPU", "7 Mhz", "68000", "Configurations", "Chipset"}, - {"Chipset", "Fast copper", "OCS", "CPU and FPU", "ROM"}, + {"Chipset", "BlitNormal", "OCS", "CPU and FPU", "ROM"}, {"ROM", "MainROM", "cboMainROM", "Chipset", "RAM"}, {"RAM", "Chipmem", "Chipmem", "ROM", "Floppy drives"}, {"Floppy drives", "cmdSel0", "DF0:", "RAM", "Hard drives / CD"}, {"Hard drives / CD", "cmdCreateHDF", "cmdAddDir", "Floppy drives", "Display"}, - {"Display", "sldWidth", "sldWidth", "Hard drives / CD", "Sound"}, + {"Display", "Frameskip", "Frameskip", "Hard drives / CD", "Sound"}, {"Sound", "sndDisable", "sndDisable", "Display", "Input"}, {"Input", "cboPort0", "cboPort0", "Sound", "Miscellaneous"}, {"Miscellaneous", "StatusLine", "StatusLine", "Input", "Savestates"}, @@ -78,10 +78,9 @@ static NavigationMap navMap[] = {"Full ECS", "Chipset", "BlitWait", "ECS Agnus", "AGA"}, {"AGA", "Chipset", "Chipset", "Full ECS", "NTSC"}, {"NTSC", "Chipset", "Chipset", "AGA", "CollNone"}, - {"BlitNormal", "OCS", "Fast copper", "CollFull", "Immediate"}, - {"Immediate", "ECS Agnus", "Fast copper", "BlitNormal", "BlitWait"}, - {"BlitWait", "Full ECS", "Fast copper", "Immediate", "CollNone"}, - {"Fast copper", "BlitNormal", "Chipset", "CollFull", "CollNone"}, + {"BlitNormal", "OCS", "Chipset", "CollFull", "Immediate"}, + {"Immediate", "ECS Agnus", "Chipset", "BlitNormal", "BlitWait"}, + {"BlitWait", "Full ECS", "Chipset", "Immediate", "CollNone"}, {"CollNone", "Chipset", "Chipset", "NTSC", "Sprites only"}, {"Sprites only", "Chipset", "Chipset", "CollNone", "CollPlay"}, {"CollPlay", "Chipset", "Chipset", "Sprites only", "CollFull"}, @@ -150,10 +149,10 @@ static NavigationMap navMap[] = {"CDVol", "", "", "cboCD", "cmdProp0"}, // PanelDisplay - {"sldWidth", "", "", "Frameskip", "sldHeight"}, - {"sldHeight", "", "", "sldWidth", "sldVertPos"}, - {"sldVertPos", "", "", "sldHeight", "FSRatio"}, - {"Frameskip", "Display", "Display", "4by3Ratio", "sldWidth"}, + {"Frameskip", "Display", "Display", "Linear (smooth)", "Auto"}, + {"Auto", "Display", "Display", "Frameskip", "Nearest Neighbor (pixelated)"}, + { "Nearest Neighbor (pixelated)", "Display", "Display", "Auto", "Linear (smooth)"}, + {"Linear (smooth)", "Display", "Display", "Nearest Neighbor (pixelated)", "Frameskip"}, //PanelSound {"sndDisable", "Sound", "Mono", "sldStereoDelay", "sndDisEmu"},