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/stats] Display or not the formula input view

Browse Source
This commit is contained in:
Léa Saviot
2018-05-29 10:02:11 +02:00
parent 70e1f5b25b
commit dbf1597ef3
4 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/shared/store_controller.cpp
View File

@@ -13,15 +13,23 @@ StoreController::ContentView::ContentView(FloatPairStore * store, Responder * pa
Responder(parentResponder),
m_dataView(store, this, dataSource, selectionDataSource),
m_formulaInputView(this, textFieldDelegate),
m_displayInputFormulaView(false)
m_displayFormulaInputView(false)
{
m_dataView.setBackgroundColor(Palette::WallScreenDark);
m_dataView.setVerticalCellOverlap(0);
m_dataView.setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin);
}
void StoreController::ContentView::displayFormulaInput(bool display) {
if (m_displayFormulaInputView != display) {
m_displayFormulaInputView = display;
layoutSubviews();
markRectAsDirty(bounds());
}
}
void StoreController::ContentView::didBecomeFirstResponder() {
app()->setFirstResponder(&m_dataView);
app()->setFirstResponder(m_displayFormulaInputView ? static_cast<Responder *>(&m_formulaInputView) : static_cast<Responder *>(&m_dataView));
}
View * StoreController::ContentView::subviewAtIndex(int index) {
@@ -31,10 +39,13 @@ View * StoreController::ContentView::subviewAtIndex(int index) {
}
void StoreController::ContentView::layoutSubviews() {
KDRect dataViewFrame(0, 0, bounds().width(), bounds().height() - (m_displayInputFormulaView ? BufferTextViewWithTextField::k_height : 0));
KDRect dataViewFrame(0, 0, bounds().width(), bounds().height() - (m_displayFormulaInputView ? BufferTextViewWithTextField::k_height : 0));
m_dataView.setFrame(dataViewFrame);
KDRect formulaFrame(0, bounds().height() - BufferTextViewWithTextField::k_height, bounds().width(), m_displayInputFormulaView ? BufferTextViewWithTextField::k_height : 0);
m_formulaInputView.setFrame(formulaFrame);
m_formulaInputView.setFrame(formulaFrame());
}
KDRect StoreController::ContentView::formulaFrame() const {
return KDRect(0, bounds().height() - BufferTextViewWithTextField::k_height, bounds().width(), m_displayFormulaInputView ? BufferTextViewWithTextField::k_height : 0);
}
StoreController::StoreController(Responder * parentResponder, FloatPairStore * store, ButtonRowController * header) :
@@ -47,10 +58,16 @@ StoreController::StoreController(Responder * parentResponder, FloatPairStore * s
}
void StoreController::displayFormulaInput() {
contentView()->displayFormulaInput(true);
}
bool StoreController::textFieldDidFinishEditing(TextField * textField, const char * text, Ion::Events::Event event) {
if (textField == contentView()->formulaInputView()->textField()) {
// Handle formula input
contentView()->displayFormulaInput(false);
app()->setFirstResponder(contentView());
return true;
}
AppsContainer * appsContainer = ((TextFieldDelegateApp *)app())->container();
Context * globalContext = appsContainer->globalContext();
double floatBody = Expression::approximateToScalar<double>(text, *globalContext);