Merge remote-tracking branch 'github/master' into Tree

This commit is contained in:
Émilie Feral
2018-09-13 17:03:31 +02:00
54 changed files with 492 additions and 238 deletions

View File

@@ -42,7 +42,7 @@ private:
#endif
Matrix
};
constexpr static int k_maxNumberOfDisplayedRows = 6; //240/40
constexpr static int k_maxNumberOfDisplayedRows = 6; //240/Matrix::ToolboxRowHeight
#if LIST_VARIABLES
constexpr static int k_numberOfMenuRows = 3;
#else