From 3cda2abc52726c70ef8bbae7cb9e2de2a986de7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 1 Mar 2017 17:20:37 +0100
Subject: [PATCH] [escher] Correct bug in button row controller

Change-Id: If0f0eccb737a85baa3f96f3bfd212b7cc150536f
---
 escher/src/button_row_controller.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/escher/src/button_row_controller.cpp b/escher/src/button_row_controller.cpp
index 5829d78a8..56b77a382 100644
--- a/escher/src/button_row_controller.cpp
+++ b/escher/src/button_row_controller.cpp
@@ -187,7 +187,6 @@ const char * ButtonRowController::title() const {
 }
 
 void ButtonRowController::didBecomeFirstResponder(){
-  m_contentView.layoutSubviews();
   app()->setFirstResponder(m_contentView.mainViewController());
 }
 
@@ -218,6 +217,9 @@ bool ButtonRowController::handleEvent(Ion::Events::Event event) {
 }
 
 void ButtonRowController::viewWillAppear() {
+  /* We need to layout subviews at first appearance because the number of
+   * buttons might have changed between 2 appearences. */
+  m_contentView.layoutSubviews();
   m_contentView.mainViewController()->viewWillAppear();
 }