mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
[escher] Change name: viewWillDisappear -> viewDidDisappear
Change-Id: Ie7e324cfd9c1313ef4f5310e1688be0b7fabd0bf
This commit is contained in:
@@ -204,7 +204,7 @@ void MathToolbox::viewWillAppear() {
|
||||
m_listController.setFirstSelectedRow(0);
|
||||
}
|
||||
|
||||
void MathToolbox::viewWillDisappear() {
|
||||
void MathToolbox::viewDidDisappear() {
|
||||
m_selectableTableView.deselectTable();
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -255,6 +255,6 @@ void VariableBoxController::viewWillAppear() {
|
||||
m_contentViewController.reloadData();
|
||||
}
|
||||
|
||||
void VariableBoxController::viewWillDisappear() {
|
||||
void VariableBoxController::viewDidDisappear() {
|
||||
m_contentViewController.deselectTable();
|
||||
}
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -16,7 +16,7 @@ public:
|
||||
void dismissModalViewController();
|
||||
bool isDisplayingModal();
|
||||
void viewWillAppear() override;
|
||||
void viewWillDisappear() override;
|
||||
void viewDidDisappear() override;
|
||||
private:
|
||||
class ContentView : public View {
|
||||
public:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
virtual const char * title();
|
||||
virtual View * view() = 0;
|
||||
virtual void viewWillAppear();
|
||||
virtual void viewWillDisappear();
|
||||
virtual void viewDidDisappear();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -105,5 +105,5 @@ void App::willBecomeInactive() {
|
||||
if (m_modalViewController.isDisplayingModal()) {
|
||||
dismissModalViewController();
|
||||
}
|
||||
m_modalViewController.viewWillDisappear();
|
||||
m_modalViewController.viewDidDisappear();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -12,5 +12,5 @@ const char * ViewController::title() {
|
||||
void ViewController::viewWillAppear() {
|
||||
}
|
||||
|
||||
void ViewController::viewWillDisappear() {
|
||||
void ViewController::viewDidDisappear() {
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user