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

[apps] Graph: Handle enter on tangent graph controller

Browse Source
This commit is contained in:
Émilie Feral
2018-01-12 15:09:06 +01:00
committed by EmilieNumworks
parent 9eae976e78
commit 1c49dab2b7
7 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/graph/graph/tangent_graph_controller.cpp
View File

@@ -62,4 +62,10 @@ bool TangentGraphController::moveCursorHorizontally(int direction) {
return privateMoveCursorHorizontally(m_cursor, direction, m_graphRange, k_numberOfCursorStepsInGradUnit, m_function, myApp, k_cursorTopMarginRatio, k_cursorRightMarginRatio, k_cursorBottomMarginRatio, k_cursorLeftMarginRatio);
}
bool TangentGraphController::handleEnter() {
StackViewController * stack = static_cast<StackViewController *>(parentResponder());
stack->pop();
return true;
}
}

1
apps/graph/graph/tangent_graph_controller.h
View File

@@ -24,6 +24,7 @@ private:
BannerView * bannerView() override { return m_bannerView; };
void reloadBannerView() override;
bool moveCursorHorizontally(int direction) override;
bool handleEnter() override;
GraphView * m_graphView;
BannerView * m_bannerView;
Shared::InteractiveCurveViewRange * m_graphRange;

3
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -71,9 +71,6 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
header()->setSelectedButton(0);
return true;
}
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
return handleEnter();
}
return false;
}

1
apps/shared/interactive_curve_view_controller.h
View File

@@ -30,7 +30,6 @@ public:
void didEnterResponderChain(Responder * previousFirstResponder) override;
void willExitResponderChain(Responder * nextFirstResponder) override;
protected:
virtual bool handleEnter() = 0;
Responder * tabController() const;
virtual StackViewController * stackController() const;
virtual void initRangeParameters() = 0;

3
apps/shared/simple_interactive_curve_view_controller.cpp
View File

@@ -23,6 +23,9 @@ bool SimpleInteractiveCurveViewController::handleEvent(Ion::Events::Event event)
if (event == Ion::Events::Left || event == Ion::Events::Right) {
return handleLeftRightEvent(event);
}
if (event == Ion::Events::EXE || event == Ion::Events::OK) {
return handleEnter();
}
return false;
}

1
apps/shared/simple_interactive_curve_view_controller.h
View File

@@ -29,6 +29,7 @@ protected:
virtual bool moveCursorHorizontally(int direction) { return false; };
virtual InteractiveCurveViewRange * interactiveCurveViewRange() = 0;
virtual CurveView * curveView() = 0;
virtual bool handleEnter() = 0;
CurveViewCursor * m_cursor;
};

2
apps/shared/sum_graph_controller.h
View File

@@ -45,7 +45,7 @@ private:
TextFieldDelegateApp * textFieldDelegateApp() override {
return static_cast<TextFieldDelegateApp *>(app());
}
bool handleEnter();
bool handleEnter() override;
class LegendView : public View {
public:
LegendView(SumGraphController * controller, char sumSymbol);