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/calculation] align the historic to the bottom

Browse Source 
Change-Id: Ide539c753376ac1fa1cd60ecd3605f112b19f28d
This commit is contained in:
Émilie Feral
2016-10-27 16:51:30 +02:00
parent e368b24240
commit d8179abd77
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/calculation_store.h
View File

@@ -13,7 +13,7 @@ public:
void deleteCalculationAtIndex(int i);
int numberOfCalculations();
private:
static constexpr int k_maxNumberOfCalculations = 5;
static constexpr int k_maxNumberOfCalculations = 20;
Calculation * m_start;
Calculation m_calculations[k_maxNumberOfCalculations];
};

13
apps/calculation/edit_expression_controller.cpp
View File

@@ -4,7 +4,7 @@
namespace Calculation {
EditExpressionController::ContentView::ContentView(View * subview) :
EditExpressionController::ContentView::ContentView(TableView * subview) :
View(),
m_mainView(subview),
m_textField(nullptr, m_textBody, 255)
@@ -29,8 +29,8 @@ View * EditExpressionController::ContentView::subviewAtIndex(int index) {
}
void EditExpressionController::ContentView::layoutSubviews() {
KDRect mainViewFram(0, 0, bounds().width(), bounds().height() - k_textFieldHeight);
m_mainView->setFrame(mainViewFram);
KDRect mainViewFrame(0, 0, bounds().width(), bounds().height() - k_textFieldHeight);
m_mainView->setFrame(mainViewFrame);
KDRect inputViewFram(0, bounds().height() - k_textFieldHeight, bounds().width(), k_textFieldHeight);
m_textField.setFrame(inputViewFram);
}
@@ -39,9 +39,13 @@ TextField * EditExpressionController::ContentView::textField() {
return &m_textField;
}
TableView * EditExpressionController::ContentView::mainView() {
return m_mainView;
}
EditExpressionController::EditExpressionController(Responder * parentResponder, HistoryController * historyController, CalculationStore * calculationStore) :
ViewController(parentResponder),
m_contentView(historyController->view()),
m_contentView((TableView *)historyController->view()),
m_historyController(historyController),
m_calculationStore(calculationStore)
{
@@ -73,6 +77,7 @@ bool EditExpressionController::handleEvent(Ion::Events::Event event) {
calculation.setContent(textBody(), calculationApp->globalContext());
m_calculationStore->push(&calculation);
m_historyController->reload();
m_contentView.mainView()->scrollToCell(0, m_historyController->numberOfRows()-1);
m_contentView.textField()->setTextBuffer("");
return true;
}

5
apps/calculation/edit_expression_controller.h
View File

@@ -21,14 +21,15 @@ public:
private:
class ContentView : public View {
public:
ContentView(View * subview);
ContentView(TableView * subview);
int numberOfSubviews() const override;
View * subviewAtIndex(int index) override;
void layoutSubviews() override;
TextField * textField();
TableView * mainView();
private:
static constexpr KDCoordinate k_textFieldHeight = 20;
View * m_mainView;
TableView * m_mainView;
TextField m_textField;
char m_textBody[255];
};