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

[escher] ExpressionField does not inherit from EditableField

Browse Source
This commit is contained in:
Émilie Feral
2018-10-22 15:02:38 +02:00
parent 04a08087a7
commit 0a438b1803
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
escher/include/escher/expression_field.h
View File

@@ -7,14 +7,12 @@
#include <escher/text_field_delegate.h>
#include <poincare/layout.h>
class ExpressionField : public Responder, public View, public EditableField {
class ExpressionField : public Responder, public View {
public:
ExpressionField(Responder * parentResponder, char * textBuffer, int textBufferLength, TextFieldDelegate * textFieldDelegate, LayoutFieldDelegate * layoutFieldDelegate);
void setEditing(bool isEditing, bool reinitDraftBuffer = true) override;
bool isEditing() const override;
char XNTChar(char defaultXNTChar) override;
bool shouldFinishEditing(Ion::Events::Event event) override;
void setEditing(bool isEditing, bool reinitDraftBuffer = true);
bool isEditing() const;
/* Warning: this function is VERY dangerous! Indeed: sometimes the
* m_layoutField might overflow the m_textBuffer once serialized
* and still have been accepted before because the model can hold a longer
@@ -26,7 +24,7 @@ public:
bool editionIsInTextField() const;
bool isEmpty() const;
bool heightIsMaximal() const;
bool handleEventWithText(const char * text, bool indentation = false, bool forceCursorRightOfText = false) override;
bool handleEventWithText(const char * text, bool indentation = false, bool forceCursorRightOfText = false);
/* View */
int numberOfSubviews() const override { return 1; }

8
escher/src/expression_field.cpp
View File

@@ -35,14 +35,6 @@ bool ExpressionField::isEditing() const {
return editionIsInTextField() ? m_textField.isEditing() : m_layoutField.isEditing();
}
char ExpressionField::XNTChar(char defaultXNTChar) {
return editionIsInTextField() ? m_textField.XNTChar(defaultXNTChar) : m_layoutField.XNTChar(defaultXNTChar);
}
bool ExpressionField::shouldFinishEditing(Ion::Events::Event event) {
return editionIsInTextField() ? m_textField.shouldFinishEditing(event) : m_layoutField.shouldFinishEditing(event);
}
const char * ExpressionField::text() {
if (!editionIsInTextField()) {
m_layoutField.serialize(m_textBuffer, m_textBufferLength);