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

[apps/escher/poincare] Use 2D Edition in Sequence and Graph apps.

Browse Source 
EditableExpressionView is renamed ScrollableViewWithCursor.
EditableExpressionView is now a View that displays either a TextField or
a ScrollableViewWithCursor, depending on Poincare::Preferences.

Change-Id: Id44ddcd9a83f5fd17d65753ca4c94c5c7cda9b8a
This commit is contained in:
Léa Saviot
2018-01-22 17:38:02 +01:00
parent 17cbcd0ab5
commit 4d778b5d9f
42 changed files with 793 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/variable_box_controller.cpp
View File

@@ -202,9 +202,9 @@ void VariableBoxController::ContentViewController::setTextFieldSender(TextField
m_insertTextAction = &insertTextInTextField;
}
void VariableBoxController::ContentViewController::setEditableExpressionViewSender(EditableExpressionView * editableExpressionView) {
m_sender = editableExpressionView;
m_insertTextAction = &insertTextInEditableExpressionView;
void VariableBoxController::ContentViewController::setScrollableExpressionViewWithCursorSender(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor) {
m_sender = scrollableExpressionViewWithCursor;
m_insertTextAction = &insertTextInScrollableExpressionViewWithCursor;
}
void VariableBoxController::ContentViewController::reloadData() {
@@ -288,12 +288,12 @@ void VariableBoxController::ContentViewController::insertTextInTextField(void *
textField->setCursorLocation(textField->cursorLocation() + strlen(textToInsert));
}
void VariableBoxController::ContentViewController::insertTextInEditableExpressionView(void * sender, const char * textToInsert) {
EditableExpressionView * editableExpressionView = static_cast<EditableExpressionView *>(sender);
if (!editableExpressionView->isEditing()) {
editableExpressionView->setEditing(true);
void VariableBoxController::ContentViewController::insertTextInScrollableExpressionViewWithCursor(void * sender, const char * textToInsert) {
ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor = static_cast<ScrollableExpressionViewWithCursor *>(sender);
if (!scrollableExpressionViewWithCursor->isEditing()) {
scrollableExpressionViewWithCursor->setEditing(true);
}
editableExpressionView->insertLayoutFromTextAtCursor(textToInsert);
scrollableExpressionViewWithCursor->insertLayoutFromTextAtCursor(textToInsert);
}
VariableBoxController::VariableBoxController(GlobalContext * context) :
@@ -310,8 +310,8 @@ void VariableBoxController::setTextFieldSender(TextField * textField) {
m_contentViewController.setTextFieldSender(textField);
}
void VariableBoxController::setEditableExpressionViewSender(EditableExpressionView * editableExpressionView) {
m_contentViewController.setEditableExpressionViewSender(editableExpressionView);
void VariableBoxController::setScrollableExpressionViewWithCursorSender(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor) {
m_contentViewController.setScrollableExpressionViewWithCursorSender(scrollableExpressionViewWithCursor);
}
void VariableBoxController::viewWillAppear() {