diff --git a/apps/code/console_controller.cpp b/apps/code/console_controller.cpp index da5603e04..04cdc79c4 100644 --- a/apps/code/console_controller.cpp +++ b/apps/code/console_controller.cpp @@ -380,6 +380,7 @@ bool ConsoleController::textFieldDidAbortEditing(TextField * textField) { VariableBoxController * ConsoleController::variableBoxForInputEventHandler(InputEventHandler * textInput) { VariableBoxController * varBox = App::app()->variableBoxController(); + varBox->setTitle(I18n::Message::FunctionsAndVariables); varBox->loadVariablesImportedFromScripts(); return varBox; } diff --git a/apps/code/editor_controller.cpp b/apps/code/editor_controller.cpp index 2a10bbc50..704b814f5 100644 --- a/apps/code/editor_controller.cpp +++ b/apps/code/editor_controller.cpp @@ -140,6 +140,7 @@ VariableBoxController * EditorController::variableBoxForInputEventHandler(InputE assert(cursor > beginningOfAutocompletion); varBox->loadFunctionsAndVariables(m_scriptIndex, beginningOfAutocompletion, cursor - beginningOfAutocompletion); } + varBox->setTitle(I18n::Message::Autocomplete); return varBox; } diff --git a/escher/include/escher/nested_menu_controller.h b/escher/include/escher/nested_menu_controller.h index 1cc2ab1ad..6711c5eb1 100644 --- a/escher/include/escher/nested_menu_controller.h +++ b/escher/include/escher/nested_menu_controller.h @@ -11,6 +11,7 @@ class NestedMenuController : public StackViewController, public ListViewDataSour public: NestedMenuController(Responder * parentResponder, I18n::Message title = (I18n::Message)0); void setSender(InputEventHandler * sender) { m_sender = sender; } + void setTitle(I18n::Message title); // StackViewController bool handleEvent(Ion::Events::Event event) override; @@ -48,6 +49,7 @@ protected: public: ListController(Responder * parentResponder, SelectableTableView * tableView, I18n::Message title); const char * title() override; + void setTitle(I18n::Message title) { m_title = title; } View * view() override; void didBecomeFirstResponder() override; void setFirstSelectedRow(int firstSelectedRow); diff --git a/escher/src/nested_menu_controller.cpp b/escher/src/nested_menu_controller.cpp index 12d0263ae..652420e2c 100644 --- a/escher/src/nested_menu_controller.cpp +++ b/escher/src/nested_menu_controller.cpp @@ -98,6 +98,10 @@ NestedMenuController::NestedMenuController(Responder * parentResponder, I18n::Me m_selectableTableView.setDecoratorType(ScrollView::Decorator::Type::None); } +void NestedMenuController::setTitle(I18n::Message title) { + m_listController.setTitle(title); +} + bool NestedMenuController::handleEvent(Ion::Events::Event event) { return handleEventForRow(event, selectedRow()); }