Simpler menu navigation

Click = Select or Confirm
DblClick = One Level Up
TripleClick = Home
pull/155/head
fp64lib 3 years ago
parent 469ef79fa5
commit 3cc949aeb3
  1. 25
      src/uimenu.cpp
  2. 6
      src/userinterface.cpp

@ -393,6 +393,11 @@ void CUIMenu::EditGlobalParameter (CUIMenu *pUIMenu, TMenuEvent Event)
} }
pUIMenu->m_pMiniDexed->SetParameter (Param, nValue); pUIMenu->m_pMiniDexed->SetParameter (Param, nValue);
break; break;
case MenuEventSelect:
// when a parameter is selected --> accept change and return one level up
pUIMenu->EventHandler( CUIMenu::MenuEventBack );
return;
default: default:
return; return;
@ -444,6 +449,11 @@ void CUIMenu::EditVoiceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event)
pUIMenu->TGShortcutHandler (Event); pUIMenu->TGShortcutHandler (Event);
return; return;
case MenuEventSelect:
// when a parameter is selected --> accept change and return one level up
pUIMenu->EventHandler( CUIMenu::MenuEventBack );
return;
default: default:
return; return;
} }
@ -492,6 +502,11 @@ void CUIMenu::EditProgramNumber (CUIMenu *pUIMenu, TMenuEvent Event)
pUIMenu->TGShortcutHandler (Event); pUIMenu->TGShortcutHandler (Event);
return; return;
case MenuEventSelect:
// when a parameter is selected --> accept change and return one level up
pUIMenu->EventHandler( CUIMenu::MenuEventBack );
return;
default: default:
return; return;
} }
@ -544,6 +559,11 @@ void CUIMenu::EditTGParameter (CUIMenu *pUIMenu, TMenuEvent Event)
pUIMenu->TGShortcutHandler (Event); pUIMenu->TGShortcutHandler (Event);
return; return;
case MenuEventSelect:
// when a parameter is selected --> accept change and return one level up
pUIMenu->EventHandler( CUIMenu::MenuEventBack );
return;
default: default:
return; return;
} }
@ -649,6 +669,11 @@ void CUIMenu::EditOPParameter (CUIMenu *pUIMenu, TMenuEvent Event)
pUIMenu->OPShortcutHandler (Event); pUIMenu->OPShortcutHandler (Event);
return; return;
case MenuEventSelect:
// when a parameter is selected --> accept change and return one level up
pUIMenu->EventHandler( CUIMenu::MenuEventBack );
return;
default: default:
return; return;
} }

@ -197,11 +197,13 @@ void CUserInterface::EncoderEventHandler (CKY040::TEvent Event)
break; break;
case CKY040::EventSwitchClick: case CKY040::EventSwitchClick:
m_Menu.EventHandler (CUIMenu::MenuEventBack); // m_Menu.EventHandler (CUIMenu::MenuEventBack);
m_Menu.EventHandler (CUIMenu::MenuEventSelect);
break; break;
case CKY040::EventSwitchDoubleClick: case CKY040::EventSwitchDoubleClick:
m_Menu.EventHandler (CUIMenu::MenuEventSelect); // m_Menu.EventHandler (CUIMenu::MenuEventSelect);
m_Menu.EventHandler (CUIMenu::MenuEventBack);
break; break;
case CKY040::EventSwitchTripleClick: case CKY040::EventSwitchTripleClick:

Loading…
Cancel
Save