UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] Display different varbox titles from editor and console

Browse Source
This commit is contained in:
Léa Saviot
2020-04-30 12:18:58 +02:00
committed by Émilie Feral
parent 5986716031
commit bba5b237d2
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/code/console_controller.cpp
View File

@@ -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;
}

1
apps/code/editor_controller.cpp
View File

@@ -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;
}

2
escher/include/escher/nested_menu_controller.h
View File

@@ -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);

4
escher/src/nested_menu_controller.cpp
View File

@@ -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());
}