From ad0df1f2f61c8cac294b89936a1ed718462ea2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 20 Jan 2017 10:21:04 +0100 Subject: [PATCH] [escher] In header view controller, delete useless method Change-Id: I810d03878c01e472dfaf1134897337ebf8a921a0 --- apps/interactive_curve_view_controller.cpp | 2 -- escher/include/escher/header_view_controller.h | 1 - escher/src/header_view_controller.cpp | 5 +---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/interactive_curve_view_controller.cpp b/apps/interactive_curve_view_controller.cpp index 0aa258262..72f60258b 100644 --- a/apps/interactive_curve_view_controller.cpp +++ b/apps/interactive_curve_view_controller.cpp @@ -105,8 +105,6 @@ void InteractiveCurveViewController::didBecomeFirstResponder() { } headerViewController()->setSelectedButton(-1); curveView()->selectMainView(true); - // Layout view whe the graph view that might have been modified by the zoom page - headerViewController()->layoutView(); // Reload graph view curveView()->reload(); reloadBannerView(); diff --git a/escher/include/escher/header_view_controller.h b/escher/include/escher/header_view_controller.h index e8707bf0f..73fb8d94b 100644 --- a/escher/include/escher/header_view_controller.h +++ b/escher/include/escher/header_view_controller.h @@ -16,7 +16,6 @@ public: void didBecomeFirstResponder() override; bool handleEvent(Ion::Events::Event event) override; bool setSelectedButton(int selectedButton); - void layoutView(); private: class ContentView : public View { public: diff --git a/escher/src/header_view_controller.cpp b/escher/src/header_view_controller.cpp index e1f3e90f2..bb78530f2 100644 --- a/escher/src/header_view_controller.cpp +++ b/escher/src/header_view_controller.cpp @@ -104,6 +104,7 @@ const char * HeaderViewController::title() const { } void HeaderViewController::didBecomeFirstResponder(){ + m_contentView.layoutSubviews(); app()->setFirstResponder(m_contentView.mainViewController()); } @@ -132,7 +133,3 @@ bool HeaderViewController::handleEvent(Ion::Events::Event event) { } return false; } - -void HeaderViewController::layoutView() { - m_contentView.layoutSubviews(); -} \ No newline at end of file