Merge branch 'SaisieJolieRebase1201' into SaisieJolieMerge10Apr

Change-Id: I802dbb9f7c0eebf75a1b6cd21ddd194e89b53752

escher/src/input_view_controller.cpp

@@ -1,88 +1,46 @@
 #include <escher/input_view_controller.h>
 #include <escher/app.h>
 #include <escher/palette.h>
+#include <poincare/src/layout/horizontal_layout.h>
 #include <assert.h>
 
-InputViewController::TextFieldController::ContentView::ContentView(Responder * parentResponder, TextFieldDelegate * textFieldDelegate) :
-  Responder(parentResponder),
-  View(),
-  m_textField(this, m_textBody, m_textBody, TextField::maxBufferSize(), textFieldDelegate, false)
-{
-  m_textBody[0] = 0;
-}
-
-void InputViewController::TextFieldController::ContentView::didBecomeFirstResponder() {
-  app()->setFirstResponder(&m_textField);
-}
-
-TextField * InputViewController::TextFieldController::ContentView::textField() {
-  return &m_textField;
-}
-
-void  InputViewController::TextFieldController::ContentView::drawRect(KDContext * ctx, KDRect rect) const {
-  ctx->fillRect(KDRect(0, 0, bounds().width(), k_separatorThickness), Palette::GreyMiddle);
-  ctx->fillRect(KDRect(0, k_separatorThickness, k_textMargin, bounds().height()-k_separatorThickness), m_textField.backgroundColor());
-}
-
-KDSize InputViewController::TextFieldController::ContentView::minimalSizeForOptimalDisplay() const {
-  return KDSize(0, k_inputHeight);
-}
-
-int  InputViewController::TextFieldController::ContentView::numberOfSubviews() const {
-  return 1;
-}
-
-View * InputViewController::TextFieldController::ContentView::subviewAtIndex(int index) {
-  return &m_textField;
-}
-
-void  InputViewController::TextFieldController::ContentView::layoutSubviews() {
-  m_textField.setFrame(KDRect(k_textMargin, k_separatorThickness, bounds().width()-k_textMargin, bounds().height()));
-}
-
-InputViewController::TextFieldController::TextFieldController(Responder * parentResponder, TextFieldDelegate * textFieldDelegate) :
+InputViewController::EditableExpressionViewController::EditableExpressionViewController(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, ScrollableExpressionViewWithCursorDelegate * scrollableExpressionViewWithCursorDelegate) :
   ViewController(parentResponder),
-  m_view(this, textFieldDelegate)
+  m_editableExpressionView(this, textFieldDelegate, scrollableExpressionViewWithCursorDelegate)
 {
 }
 
-View * InputViewController::TextFieldController::view() {
-  return &m_view;
+void InputViewController::EditableExpressionViewController::didBecomeFirstResponder() {
+  app()->setFirstResponder(&m_editableExpressionView);
 }
 
-void InputViewController::TextFieldController::didBecomeFirstResponder() {
-  app()->setFirstResponder(&m_view);
-}
-
-TextField * InputViewController::TextFieldController::textField() {
-  return m_view.textField();
-}
-
-InputViewController::InputViewController(Responder * parentResponder, ViewController * child, TextFieldDelegate * textFieldDelegate) :
+InputViewController::InputViewController(Responder * parentResponder, ViewController * child, TextFieldDelegate * textFieldDelegate, ScrollableExpressionViewWithCursorDelegate * scrollableExpressionViewWithCursorDelegate) :
   ModalViewController(parentResponder, child),
-  m_textFieldController(this, this),
+  m_editableExpressionViewController(this, this, this),
   m_successAction(Invocation(nullptr, nullptr)),
   m_failureAction(Invocation(nullptr, nullptr)),
-  m_textFieldDelegate(textFieldDelegate)
+  m_textFieldDelegate(textFieldDelegate),
+  m_scrollableExpressionViewWithCursorDelegate(scrollableExpressionViewWithCursorDelegate),
+  m_inputViewHeightIsMaximal(false)
 {
 }
 
 const char * InputViewController::textBody() {
-  return m_textFieldController.textField()->text();
+  return m_editableExpressionViewController.editableExpressionView()->text();
 }
 
 void InputViewController::edit(Responder * caller, Ion::Events::Event event, void * context, const char * initialText, Invocation::Action successAction, Invocation::Action failureAction) {
   m_successAction = Invocation(successAction, context);
   m_failureAction = Invocation(failureAction, context);
-  displayModalViewController(&m_textFieldController, 1.0f, 1.0f);
-  m_textFieldController.textField()->handleEvent(event);
+  displayModalViewController(&m_editableExpressionViewController, 1.0f, 1.0f);
+  m_editableExpressionViewController.editableExpressionView()->handleEvent(event);
   if (initialText != nullptr) {
-    m_textFieldController.textField()->handleEventWithText(initialText);
+    m_editableExpressionViewController.editableExpressionView()->setText(initialText);
   }
 }
 
-void InputViewController::abortTextFieldEditionAndDismiss() {
-  m_textFieldController.textField()->setEditing(false);
+void InputViewController::abortEditionAndDismiss() {
+  m_editableExpressionViewController.editableExpressionView()->setEditing(false);
   dismissModalViewController();
 }
 
@@ -91,15 +49,11 @@ bool InputViewController::textFieldShouldFinishEditing(TextField * textField, Io
 }
 
 bool InputViewController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
-  m_successAction.perform(this);
-  dismissModalViewController();
-  return true;
+  return inputViewDidFinishEditing();
 }
 
-bool InputViewController::textFieldDidAbortEditing(TextField * textField, const char * text) {
-  m_failureAction.perform(this);
-  dismissModalViewController();
-  return true;
+bool InputViewController::textFieldDidAbortEditing(TextField * textField) {
+  return inputViewDidAbortEditing();
 }
 
 bool InputViewController::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
@@ -109,3 +63,45 @@ bool InputViewController::textFieldDidReceiveEvent(TextField * textField, Ion::E
 Toolbox * InputViewController::toolboxForTextInput(TextInput * input) {
   return m_textFieldDelegate->toolboxForTextInput(input);
 }
+
+bool InputViewController::scrollableExpressionViewWithCursorShouldFinishEditing(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor, Ion::Events::Event event) {
+  return event == Ion::Events::OK || event == Ion::Events::EXE;
+}
+
+bool InputViewController::scrollableExpressionViewWithCursorDidReceiveEvent(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor, Ion::Events::Event event) {
+  return m_scrollableExpressionViewWithCursorDelegate->scrollableExpressionViewWithCursorDidReceiveEvent(scrollableExpressionViewWithCursor, event);
+}
+
+bool InputViewController::scrollableExpressionViewWithCursorDidFinishEditing(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor, const char * text, Ion::Events::Event event) {
+  return inputViewDidFinishEditing();
+}
+
+bool InputViewController::scrollableExpressionViewWithCursorDidAbortEditing(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor) {
+  return inputViewDidAbortEditing();
+}
+
+void InputViewController::scrollableExpressionViewWithCursorDidChangeSize(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor) {
+  // Reload the view only if the EditableExpressionView height actually changes,
+  // i.e. not if the height is already maximal and stays maximal.
+  bool newInputViewHeightIsMaximal = m_editableExpressionViewController.editableExpressionView()->heightIsMaximal();
+  if (!m_inputViewHeightIsMaximal || !newInputViewHeightIsMaximal) {
+    m_inputViewHeightIsMaximal = newInputViewHeightIsMaximal;
+    reloadView();
+  }
+}
+
+Toolbox * InputViewController::toolboxForScrollableExpressionViewWithCursor(ScrollableExpressionViewWithCursor * scrollableExpressionViewWithCursor) {
+  return m_scrollableExpressionViewWithCursorDelegate->toolboxForScrollableExpressionViewWithCursor(scrollableExpressionViewWithCursor);
+}
+
+bool InputViewController::inputViewDidFinishEditing() {
+  m_successAction.perform(this);
+  dismissModalViewController();
+  return true;
+}
+
+bool InputViewController::inputViewDidAbortEditing() {
+  m_failureAction.perform(this);
+  dismissModalViewController();
+  return true;
+}