From f38bbff447e33e38d346abe63d2c0dfe2d383d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 24 Jan 2018 10:20:09 +0100 Subject: [PATCH] [escher] Fix responder order bug. EditableExpressionView cannot pass the first responder state to one of its children, otherwise Calculation::EditableExpressionView's overriden handleEvent method is never called. Change-Id: Id2b56b9501e67431e860573cf4c62a16651c3958 --- escher/include/escher/editable_expression_view.h | 1 - escher/src/editable_expression_view.cpp | 8 -------- 2 files changed, 9 deletions(-) diff --git a/escher/include/escher/editable_expression_view.h b/escher/include/escher/editable_expression_view.h index d0c6e88b8..44d5f867e 100644 --- a/escher/include/escher/editable_expression_view.h +++ b/escher/include/escher/editable_expression_view.h @@ -30,7 +30,6 @@ public: KDSize minimalSizeForOptimalDisplay() const override; /* Responder */ - void didBecomeFirstResponder() override; bool handleEvent(Ion::Events::Event event) override; static constexpr int k_bufferLength = TextField::maxBufferSize(); diff --git a/escher/src/editable_expression_view.cpp b/escher/src/editable_expression_view.cpp index 359d129cf..cc557b04e 100644 --- a/escher/src/editable_expression_view.cpp +++ b/escher/src/editable_expression_view.cpp @@ -88,14 +88,6 @@ void EditableExpressionView::drawRect(KDContext * ctx, KDRect rect) const { } } -void EditableExpressionView::didBecomeFirstResponder() { - if (editionIsInTextField()) { - app()->setFirstResponder(&m_textField); - return; - } - app()->setFirstResponder(&m_scrollableExpressionViewWithCursor); -} - bool EditableExpressionView::handleEvent(Ion::Events::Event event) { return editionIsInTextField() ? m_textField.handleEvent(event) : m_scrollableExpressionViewWithCursor.handleEvent(event); }