[apps/code] Add an EditorView that has a gutter

apps/code/Makefile

@@ -8,6 +8,7 @@ app_objs += $(addprefix apps/code/,\
   console_line_cell.o\
   console_store.o\
   editor_controller.o\
+  editor_view.o\
   helpers.o\
   menu_controller.o\
   python_toolbox.o\

apps/code/editor_controller.cpp

@@ -10,12 +10,12 @@ namespace Code {
 
 EditorController::EditorController(MenuController * menuController) :
   ViewController(nullptr),
-  m_textArea(this),
+  m_editorView(this),
   m_areaBuffer(nullptr),
   m_script(Ion::Storage::Record()),
   m_menuController(menuController)
 {
-  m_textArea.setDelegate(this);
+  m_editorView.setTextAreaDelegate(this);
 }
 
 EditorController::~EditorController() {
@@ -31,7 +31,7 @@ void EditorController::setScript(Script script) {
   assert(m_areaBuffer == nullptr);
   m_areaBuffer = new char[availableScriptSize];
   strlcpy(m_areaBuffer, scriptBody, scriptBodySize);
-  m_textArea.setText(m_areaBuffer, availableScriptSize);
+  m_editorView.setText(m_areaBuffer, availableScriptSize);
 }
 
 // TODO: this should be done in textAreaDidFinishEditing maybe??
@@ -49,11 +49,11 @@ bool EditorController::handleEvent(Ion::Events::Event event) {
 }
 
 void EditorController::didBecomeFirstResponder() {
-  app()->setFirstResponder(&m_textArea);
+  app()->setFirstResponder(&m_editorView);
 }
 
 void EditorController::viewWillAppear() {
-  m_textArea.setCursorLocation(strlen(m_textArea.text()));
+  m_editorView.setCursorLocation(strlen(m_editorView.text()));
 }
 
 void EditorController::viewDidDisappear() {

apps/code/editor_controller.h

@@ -3,6 +3,7 @@
 
 #include <escher.h>
 #include "script.h"
+#include "editor_view.h"
 
 namespace Code {
 
@@ -16,7 +17,7 @@ public:
   void setScript(Script script);
 
   /* ViewController */
-  View * view() override { return &m_textArea; }
+  View * view() override { return &m_editorView; }
   bool handleEvent(Ion::Events::Event event) override;
   void didBecomeFirstResponder() override;
   void viewWillAppear() override;
@@ -30,7 +31,7 @@ public:
 private:
   static constexpr int k_indentationSpacesNumber = 2;
   StackViewController * stackController();
-  TextArea m_textArea;
+  EditorView m_editorView;
   char * m_areaBuffer;
   Script m_script;
   MenuController * m_menuController;

apps/code/editor_view.cpp

@@ -0,0 +1,93 @@
+#include "editor_view.h"
+#include <poincare.h>
+#include <escher/app.h>
+
+/* EditorView */
+
+EditorView::EditorView(Responder * parentResponder) :
+  Responder(parentResponder),
+  View(),
+  m_textArea(parentResponder),
+  m_gutterView(KDText::FontSize::Large)
+{
+  m_textArea.setScrollViewDelegate(this);
+}
+
+void EditorView::scrollViewDidChangeOffset(ScrollViewDataSource * scrollViewDataSource) {
+  m_gutterView.setOffset(scrollViewDataSource->offset().y());
+}
+
+int EditorView::numberOfSubviews() const {
+  return 2;
+}
+
+View * EditorView::subviewAtIndex(int index) {
+  View * subviews[] = {&m_textArea, &m_gutterView};
+  return subviews[index];
+}
+
+void EditorView::didBecomeFirstResponder() {
+  app()->setFirstResponder(&m_textArea);
+}
+
+void EditorView::layoutSubviews() {
+  m_gutterView.setOffset(0);
+  KDCoordinate gutterWidth = m_gutterView.minimalSizeForOptimalDisplay().width();
+  m_gutterView.setFrame(KDRect(0, 0, gutterWidth, bounds().height()));
+
+  m_textArea.setFrame(KDRect(
+    gutterWidth,
+    0,
+    bounds().width()-gutterWidth,
+    bounds().height()
+  ));
+}
+
+/* EditorView::GutterView */
+
+EditorView::GutterView::GutterView(KDText::FontSize fontSize) :
+  View(),
+  m_fontSize(fontSize)
+{
+}
+
+void EditorView::GutterView::drawRect(KDContext * ctx, KDRect rect) const {
+  KDColor textColor = KDColor::RGB24(0x919EA4);
+  KDColor backgroundColor = KDColor::RGB24(0xE4E6E7);
+
+  ctx->fillRect(rect, backgroundColor);
+
+  KDSize charSize = KDText::charSize(m_fontSize);
+
+  KDCoordinate firstLine = m_offset / charSize.height();
+  KDCoordinate firstLinePixelOffset = m_offset - firstLine * charSize.height();
+
+  char lineNumber[4];
+  int numberOfLines = bounds().height() / charSize.height() + 1;
+  for (int i=0; i<numberOfLines; i++) {
+    Poincare::Integer line(i + firstLine + 1);
+    line.writeTextInBuffer(lineNumber, 4);
+    KDCoordinate leftPadding = (2 - strlen(lineNumber)) * charSize.width();
+    ctx->drawString(
+      lineNumber,
+      KDPoint(k_margin + leftPadding, i*charSize.height() - firstLinePixelOffset),
+      m_fontSize,
+      textColor,
+      backgroundColor
+    );
+  }
+}
+
+void EditorView::GutterView::setOffset(KDCoordinate offset) {
+  if (m_offset == offset) {
+    return;
+  }
+  m_offset = offset;
+  markRectAsDirty(bounds());
+}
+
+
+KDSize EditorView::GutterView::minimalSizeForOptimalDisplay() const {
+  int numberOfChars = 2; // TODO: Could be computed
+  return KDSize(2 * k_margin + numberOfChars * KDText::charSize(m_fontSize).width(), 0);
+}

apps/code/editor_view.h

@@ -0,0 +1,45 @@
+#ifndef CODE_EDITOR_VIEW_H
+#define CODE_EDITOR_VIEW_H
+
+#include <escher/view.h>
+#include <escher/text_area.h>
+
+class EditorView : public Responder, public View, public ScrollViewDelegate {
+public:
+  EditorView(Responder * parentResponder);
+  void setTextAreaDelegate(TextAreaDelegate * delegate) {
+    m_textArea.setDelegate(delegate);
+  }
+  const char * text() const {
+    return m_textArea.text();
+  }
+  void setText(char * textBuffer, size_t textBufferSize) {
+    m_textArea.setText(textBuffer, textBufferSize);
+  }
+  bool setCursorLocation(int location) {
+    return m_textArea.setCursorLocation(location);
+  }
+  void scrollViewDidChangeOffset(ScrollViewDataSource * scrollViewDataSource) override;
+  void didBecomeFirstResponder() override;
+private:
+  int numberOfSubviews() const override;
+  View * subviewAtIndex(int index) override;
+  void layoutSubviews() override;
+
+  class GutterView : public View {
+  public:
+    GutterView(KDText::FontSize fontSize);
+    void drawRect(KDContext * ctx, KDRect rect) const override;
+    void setOffset(KDCoordinate offset);
+    KDSize minimalSizeForOptimalDisplay() const override;
+  private:
+    static constexpr KDCoordinate k_margin = 2;
+    KDText::FontSize m_fontSize;
+    KDCoordinate m_offset;
+  };
+
+  TextArea m_textArea;
+  GutterView m_gutterView;
+};
+
+#endif