[apps] VariableBoxController: tidy layout before disappearing

apps/variable_box_controller.cpp

@@ -172,20 +172,16 @@ bool VariableBoxController::displayEmptyController() {
   return false;
 }
 
-/* void VariableBoxController::viewDidDisappear() {
-  m_selectableTableView.deselectTable();
-  // Tidy the memoized layouts to clean TreePool
-  for (int i = 0; i < 10; i++) { // FIXME
-    m_matrixLayouts[i] = Layout();
-  }
+void VariableBoxController::viewDidDisappear() {
   // Tidy the layouts used to display the VariableBoxController to clean TreePool
   for (int i = 0; i < k_maxNumberOfDisplayedRows; i++) {
     m_leafCells[i].setLayout(Layout());
+    m_leafCells[i].setAccessoryLayout(Layout());
   }
-  ViewController::viewDidDisappear();
-  }
-
+  NestedMenuController::viewDidDisappear();
+}
 
+/*
 Layout VariableBoxController::matrixLayoutAtIndex(int index) {
   assert(m_currentPage == Page::Matrix);
   if (m_matrixLayouts[index].isUninitialized()) {

apps/variable_box_controller.h

@@ -14,6 +14,7 @@ public:
 
   // View Controller
   void viewWillAppear() override;
+  void viewDidDisappear() override;
 
   // Responder
   bool handleEvent(Ion::Events::Event event) override;

apps/variable_box_empty_controller.cpp

@@ -70,8 +70,12 @@ View * VariableBoxEmptyController::view() {
   return &m_view;
 }
 
+void VariableBoxEmptyController::viewDidDisappear() {
+  m_view.setLayout(Layout());
+}
+
 void VariableBoxEmptyController::setType(Type type) {
-  I18n::Message message;
+  I18n::Message message = I18n::Message::Default;
   Layout layout;
   switch (type) {
     case Type::Expressions:

apps/variable_box_empty_controller.h

@@ -14,8 +14,7 @@ public:
   // View Controller
   View * view() override;
   DisplayParameter displayParameter() override { return DisplayParameter::DoNotShowOwnTitle; }
-  //void viewWillAppear() override;
-  //void viewDidDisapear() override;
+  void viewDidDisappear() override;
 
   void setType(Type type);
 private: