[escher] Change name: viewWillDisappear -> viewDidDisappear

Change-Id: Ie7e324cfd9c1313ef4f5310e1688be0b7fabd0bf
This commit is contained in:
Émilie Feral
2017-04-18 15:29:09 +02:00
parent c71c1297c0
commit 5fde73dac2
17 changed files with 28 additions and 28 deletions

View File

@@ -204,7 +204,7 @@ void MathToolbox::viewWillAppear() {
m_listController.setFirstSelectedRow(0);
}
void MathToolbox::viewWillDisappear() {
void MathToolbox::viewDidDisappear() {
m_selectableTableView.deselectTable();
}

View File

@@ -24,7 +24,7 @@ public:
int typeAtLocation(int i, int j) override;
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
protected:
int stackDepth();
TextField * sender() override;

View File

@@ -255,6 +255,6 @@ void VariableBoxController::viewWillAppear() {
m_contentViewController.reloadData();
}
void VariableBoxController::viewWillDisappear() {
void VariableBoxController::viewDidDisappear() {
m_contentViewController.deselectTable();
}

View File

@@ -12,7 +12,7 @@ public:
void didBecomeFirstResponder() override;
void setTextFieldCaller(TextField * textField);
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
private:
class ContentViewController : public ViewController, public ListViewDataSource {
public:

View File

@@ -14,7 +14,7 @@ public:
bool handleEvent(Ion::Events::Event event) override;
void didBecomeFirstResponder() override;
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
private:
class ContentView : public View {
public:

View File

@@ -27,7 +27,7 @@ public:
bool handleEvent(Ion::Events::Event event) override;
bool setSelectedButton(int selectedButton);
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
private:
class ContentView : public View {
public:

View File

@@ -16,7 +16,7 @@ public:
void dismissModalViewController();
bool isDisplayingModal();
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
private:
class ContentView : public View {
public:

View File

@@ -22,7 +22,7 @@ public:
bool handleEvent(Ion::Events::Event event) override;
void didBecomeFirstResponder() override;
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
private:
class ControllerView : public View {
public:

View File

@@ -18,7 +18,7 @@ public:
void didBecomeFirstResponder() override;
void willResignFirstResponder() override;
void viewWillAppear() override;
void viewWillDisappear() override;
void viewDidDisappear() override;
private:
class ContentView : public View {
public:

View File

@@ -33,7 +33,7 @@ public:
virtual const char * title();
virtual View * view() = 0;
virtual void viewWillAppear();
virtual void viewWillDisappear();
virtual void viewDidDisappear();
};
#endif

View File

@@ -81,8 +81,8 @@ void AlternateEmptyViewController::viewWillAppear() {
}
}
void AlternateEmptyViewController::viewWillDisappear() {
void AlternateEmptyViewController::viewDidDisappear() {
if (!m_contentView.alternateEmptyViewDelegate()->isEmpty()) {
m_contentView.mainViewController()->viewWillDisappear();
m_contentView.mainViewController()->viewDidDisappear();
}
}

View File

@@ -105,5 +105,5 @@ void App::willBecomeInactive() {
if (m_modalViewController.isDisplayingModal()) {
dismissModalViewController();
}
m_modalViewController.viewWillDisappear();
m_modalViewController.viewDidDisappear();
}

View File

@@ -228,6 +228,6 @@ void ButtonRowController::viewWillAppear() {
m_contentView.mainViewController()->viewWillAppear();
}
void ButtonRowController::viewWillDisappear() {
m_contentView.mainViewController()->viewWillDisappear();
void ButtonRowController::viewDidDisappear() {
m_contentView.mainViewController()->viewDidDisappear();
}

View File

@@ -111,14 +111,14 @@ void ModalViewController::displayModalViewController(ViewController * vc, float
m_currentModalViewController = vc;
vc->setParentResponder(this);
m_previousResponder = app()->firstResponder();
m_regularViewController->viewWillDisappear();
m_regularViewController->viewDidDisappear();
m_contentView.presentModalView(vc->view(), verticalAlignment, horizontalAlignment, topMargin, leftMargin, bottomMargin, rightMargin);
m_currentModalViewController->viewWillAppear();
app()->setFirstResponder(vc);
}
void ModalViewController::dismissModalViewController() {
m_currentModalViewController->viewWillDisappear();
m_currentModalViewController->viewDidDisappear();
m_currentModalViewController = nullptr;
m_regularViewController->viewWillAppear();
app()->setFirstResponder(m_previousResponder);
@@ -150,9 +150,9 @@ void ModalViewController::viewWillAppear() {
m_regularViewController->viewWillAppear();
}
void ModalViewController::viewWillDisappear() {
void ModalViewController::viewDidDisappear() {
if (m_contentView.isDisplayingModal()) {
m_currentModalViewController->viewWillDisappear();
m_currentModalViewController->viewDidDisappear();
}
m_regularViewController->viewWillDisappear();
m_regularViewController->viewDidDisappear();
}

View File

@@ -91,7 +91,7 @@ void StackViewController::push(ViewController * vc, KDColor textColor, KDColor b
m_view.pushStack(vc, textColor, backgroundColor, separatorColor);
m_children[m_numberOfChildren++] = vc;
if (m_numberOfChildren > 1) {
m_children[m_numberOfChildren-2]->viewWillDisappear();
m_children[m_numberOfChildren-2]->viewDidDisappear();
}
setupActiveViewController();
}
@@ -102,7 +102,7 @@ void StackViewController::pop() {
ViewController * vc = m_children[m_numberOfChildren-1];
vc->setParentResponder(nullptr);
m_numberOfChildren--;
vc->viewWillDisappear();
vc->viewDidDisappear();
setupActiveViewController();
}
@@ -142,9 +142,9 @@ void StackViewController::viewWillAppear() {
}
}
void StackViewController::viewWillDisappear() {
void StackViewController::viewDidDisappear() {
ViewController * vc = m_children[m_numberOfChildren-1];
if (m_numberOfChildren > 0 && vc) {
vc->viewWillDisappear();
vc->viewDidDisappear();
}
}

View File

@@ -114,7 +114,7 @@ void TabViewController::setActiveTab(int8_t i, bool forceReactive) {
m_view.setActiveView(activeVC->view());
m_view.m_tabView.setActiveIndex(i);
if (m_activeChildIndex >= 0) {
m_children[m_activeChildIndex]->viewWillDisappear();
m_children[m_activeChildIndex]->viewDidDisappear();
}
m_activeChildIndex = i;
if (i >= 0) {
@@ -170,7 +170,7 @@ void TabViewController::viewWillAppear() {
activeVC->viewWillAppear();
}
void TabViewController::viewWillDisappear() {
void TabViewController::viewDidDisappear() {
ViewController * activeVC = m_children[m_activeChildIndex];
activeVC->viewWillDisappear();
activeVC->viewDidDisappear();
}

View File

@@ -12,5 +12,5 @@ const char * ViewController::title() {
void ViewController::viewWillAppear() {
}
void ViewController::viewWillDisappear() {
void ViewController::viewDidDisappear() {
}