diff --git a/escher/src/text_input.cpp b/escher/src/text_input.cpp index 821faeb2e..8fed816fa 100644 --- a/escher/src/text_input.cpp +++ b/escher/src/text_input.cpp @@ -47,7 +47,7 @@ void TextInput::ContentView::addSelection(const char * left, const char * right) reloadRectFromPosition(left, true); //TODO LEA } -void TextInput::ContentView::resetSelection() { +bool TextInput::ContentView::resetSelection() { const char * previousStart = m_selectionStart; if (previousStart == nullptr) { return false; diff --git a/ion/src/shared/events_modifier.cpp b/ion/src/shared/events_modifier.cpp index 9ef033c4f..90fa01a97 100644 --- a/ion/src/shared/events_modifier.cpp +++ b/ion/src/shared/events_modifier.cpp @@ -52,37 +52,37 @@ void updateModifiersFromEvent(Event e) { break; case ShiftAlphaStatus::Alpha: if (e == Shift) { - sShiftAlphaStatus = ShiftAlphaStatus::ShiftAlpha; - } else if (e == Alpha) { - sShiftAlphaStatus = ShiftAlphaStatus::AlphaLock; - } else { - sShiftAlphaStatus = ShiftAlphaStatus::Default; - } - break; - case ShiftAlphaStatus::ShiftAlpha: - if (e == Shift) { - sShiftAlphaStatus = ShiftAlphaStatus::Alpha; - } else if (e == Alpha) { - sShiftAlphaStatus = ShiftAlphaStatus::ShiftAlphaLock; - } else { - sShiftAlphaStatus = ShiftAlphaStatus::Default; - } - break; - case ShiftAlphaStatus::AlphaLock: - if (e == Shift) { - sShiftAlphaStatus = ShiftAlphaStatus::ShiftAlphaLock; - } else if (e == Alpha) { - sShiftAlphaStatus = ShiftAlphaStatus::Default; - } - break; - case ShiftAlphaStatus::ShiftAlphaLock: - if (e == Shift) { - sShiftAlphaStatus = ShiftAlphaStatus::AlphaLock; - } else if (e == Alpha) { - sShiftAlphaStatus = ShiftAlphaStatus::Default; - } - break; - } + sShiftAlphaStatus = ShiftAlphaStatus::ShiftAlpha; + } else if (e == Alpha) { + sShiftAlphaStatus = ShiftAlphaStatus::AlphaLock; + } else { + sShiftAlphaStatus = ShiftAlphaStatus::Default; + } + break; + case ShiftAlphaStatus::ShiftAlpha: + if (e == Shift) { + sShiftAlphaStatus = ShiftAlphaStatus::Alpha; + } else if (e == Alpha) { + sShiftAlphaStatus = ShiftAlphaStatus::ShiftAlphaLock; + } else { + sShiftAlphaStatus = ShiftAlphaStatus::Default; + } + break; + case ShiftAlphaStatus::AlphaLock: + if (e == Shift) { + sShiftAlphaStatus = ShiftAlphaStatus::ShiftAlphaLock; + } else if (e == Alpha) { + sShiftAlphaStatus = ShiftAlphaStatus::Default; + } + break; + case ShiftAlphaStatus::ShiftAlphaLock: + if (e == Shift) { + sShiftAlphaStatus = ShiftAlphaStatus::AlphaLock; + } else if (e == Alpha) { + sShiftAlphaStatus = ShiftAlphaStatus::Default; + } + break; + } } }