[apps/home] Reorder apps and display

Change-Id: I8890943260cb075feed6a814b7fb1ec61bc8805b
This commit is contained in:
Émilie Feral
2017-01-24 14:41:11 +01:00
parent 4f47d94a31
commit 5c2d6e0591
3 changed files with 8 additions and 5 deletions

View File

@@ -24,11 +24,14 @@ int AppsContainer::numberOfApps() {
App * AppsContainer::appAtIndex(int index) {
static App * apps[] = {
&m_homeApp,
&m_graphApp,
&m_probabilityApp,
&m_calculationApp,
&m_graphApp,
&m_graphApp,
&m_graphApp,
&m_statisticsApp,
&m_probabilityApp,
&m_regressionApp,
&m_regressionApp,
&m_statisticsApp
};
assert(sizeof(apps)/sizeof(apps[0]) == k_numberOfApps);
assert(index >= 0 && index < k_numberOfApps);

View File

@@ -29,7 +29,7 @@ public:
void switchTo(App * app) override;
private:
Window * window() override;
static constexpr int k_numberOfApps = 6;
static constexpr int k_numberOfApps = 9;
AppsWindow m_window;
Home::App m_homeApp;
Graph::App m_graphApp;

View File

@@ -29,7 +29,7 @@ private:
int numberOfIcons();
AppsContainer * m_container;
SelectableTableView m_selectableTableView;
static constexpr int k_numberOfColumns = 3;
static constexpr int k_numberOfColumns = 4;
static constexpr int k_numberOfApps = 10;
static constexpr int k_maxNumberOfCells = 16;
static constexpr int k_cellHeight = 98;