UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-28 01:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] In input view controller, ensure doing nothing in constructor

Browse Source 
Change-Id: Idd03a0d04a5ae7a43b1dc457bb25e0e0bb1a1d43
This commit is contained in:
Émilie Feral
2016-11-03 13:49:45 +01:00
parent 2f45578886
commit 101ad30530
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
escher/src/input_view_controller.cpp
View File

@@ -2,15 +2,19 @@
#include <escher/app.h>
#include <assert.h>
InputViewController::ContentView::ContentView(View * subview) :
InputViewController::ContentView::ContentView() :
View(),
m_mainView(subview),
m_mainView(nullptr),
m_textField(nullptr, m_textBody, 255),
m_visibleInput(false)
{
m_textBody[0] = 0;
}
void InputViewController::ContentView::setMainView(View * subview) {
m_mainView = subview;
}
int InputViewController::ContentView::numberOfSubviews() const {
if (m_visibleInput) {
return 2;
@@ -59,8 +63,9 @@ TextField * InputViewController::ContentView::textField() {
InputViewController::InputViewController(Responder * parentResponder, ViewController * child) :
ViewController(parentResponder),
m_contentView(child->view()),
m_contentView(),
m_previousResponder(nullptr),
m_regularViewController(child),
m_successAction(Invocation(nullptr, nullptr)),
m_failureAction(Invocation(nullptr, nullptr))
{
@@ -68,6 +73,9 @@ InputViewController::InputViewController(Responder * parentResponder, ViewContro
}
View * InputViewController::view() {
if (m_contentView.subviewAtIndex(0) == nullptr) {
m_contentView.setMainView(m_regularViewController->view());
}
return &m_contentView;
}
@@ -79,10 +87,6 @@ const char * InputViewController::textBody() {
return m_contentView.textField()->textBuffer();
}
void InputViewController::setPreviousResponder(Responder * previousResponder) {
m_previousResponder = previousResponder;
}
void InputViewController::showInput(bool show) {
m_contentView.setVisibleInput(show);
if (show) {
@@ -118,7 +122,6 @@ bool InputViewController::handleEvent(Ion::Events::Event event) {
void InputViewController::edit(Responder * caller, const char * initialContent, void * context, Invocation::Action successAction, Invocation::Action failureAction) {
m_successAction = Invocation(successAction, context);
m_failureAction = Invocation(failureAction, context);
setPreviousResponder(caller);
setTextBody(initialContent);
showInput(true);
}