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

[escher] Remove duplicate method

Browse Source 
Change-Id: Iac03f002cb6928831a8d640f1bcdeba116f71d06
This commit is contained in:
Léa Saviot
2018-05-17 12:22:01 +02:00
committed by EmilieNumworks
parent b752ab0389
commit 3953ca1c67
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/edit_expression_controller.cpp
View File

@@ -58,7 +58,7 @@ const char * EditExpressionController::textBody() {
}
void EditExpressionController::insertTextBody(const char * text) {
((ContentView *)view())->expressionField()->insertText(text);
((ContentView *)view())->expressionField()->handleEventWithText(text, false, true);
}
bool EditExpressionController::handleEvent(Ion::Events::Event event) {

4
apps/calculation/expression_field.cpp
View File

@@ -7,7 +7,7 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
return false;
}
if (event == Ion::Events::Ans) {
insertText("ans");
handleEventWithText("ans");
return true;
}
if (isEditing() && isEmpty() &&
@@ -17,7 +17,7 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
event == Ion::Events::Square ||
event == Ion::Events::Division ||
event == Ion::Events::Sto)) {
insertText("ans");
handleEventWithText("ans");
}
return(::ExpressionField::handleEvent(event));
}

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

@@ -15,7 +15,6 @@ public:
bool isEditing() const;
const char * text();
void setText(const char * text);
void insertText(const char * text);
void reload();
bool editionIsInTextField() const;
bool isEmpty() const;

9
escher/src/expression_field.cpp
View File

@@ -51,15 +51,6 @@ void ExpressionField::setText(const char * text) {
}
}
void ExpressionField::insertText(const char * text) {
if (editionIsInTextField()) {
m_textField.handleEventWithText(text);
} else {
m_expressionLayoutField.setEditing(true);
m_expressionLayoutField.handleEventWithText(text, false, true);
}
}
View * ExpressionField::subviewAtIndex(int index) {
assert(index == 0);
if (editionIsInTextField()) {