Fixed some conflicts

This commit is contained in:
Quentin Guidée
2020-02-12 17:42:58 +01:00
687 changed files with 13048 additions and 4057 deletions

View File

@@ -109,6 +109,10 @@ bool App::handleEvent(Ion::Events::Event event) {
return false;
}
void App::willExitResponderChain(Responder * nextFirstResponder) {
m_menuController.willExitApp();
}
Toolbox * App::toolboxForInputEventHandler(InputEventHandler * textInput) {
return &m_toolbox;
}