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

[apps][escher] Fix insering several letters when clicking on SIN

Browse Source 
e. g.

Change-Id: If71400b22f65878a94090fed7f3c68433a10506c
This commit is contained in:
Émilie Feral
2016-11-14 17:47:46 +01:00
parent 9181f8e8fa
commit 4ed7e06373
9 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/graph/values/values_controller.cpp
View File

@@ -230,7 +230,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
return true;
}
if (activeColumn() == 0) {
editValue(false);
editValue();
return true;
}
return false;
@@ -241,8 +241,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
}
if (event.hasText()) {
if (activeColumn() == 0 && activeRow() > 0) {
// FIXME: Only first character!
editValue(true, event.text()[0]);
editValue(event.text());
return true;
}
return false;
@@ -270,14 +269,15 @@ void ValuesController::configureDerivativeFunction() {
stack->push(&m_derivativeParameterController);
}
void ValuesController::editValue(bool overwrite, char initialDigit) {
void ValuesController::editValue(const char * initialText) {
/* This code assumes that the active cell remains the one which is edited
* until the invocation is performed. This could lead to concurrency issue in
* other cases. */
char initialTextContent[Constant::FloatBufferSizeInScientificMode];
if (overwrite) {
initialTextContent[0] = initialDigit;
initialTextContent[1] = 0;
char initialTextContent[255];
int cursorDelta = 0;
if (initialText) {
strlcpy(initialTextContent, initialText, sizeof(initialTextContent));
cursorDelta = strlen(initialText) > 1 ? -1 : 0;
} else {
if (activeRow() > m_interval.numberOfElements()) {
initialTextContent[0] = 0;
@@ -285,9 +285,10 @@ void ValuesController::editValue(bool overwrite, char initialDigit) {
Float(m_interval.element(activeRow()-1)).convertFloatToText(initialTextContent, Constant::FloatBufferSizeInScientificMode, Constant::NumberOfDigitsInMantissaInScientificMode);
}
}
int cursorLocation = strlen(initialTextContent) + cursorDelta;
App * myApp = (App *)app();
InputViewController * inputController = myApp->inputViewController();
inputController->edit(this, initialTextContent, this,
inputController->edit(this, initialTextContent, cursorLocation, this,
[](void * context, void * sender){
ValuesController * valuesController = (ValuesController *)context;
int activeRow = valuesController->activeRow();