Add missing definition of static member variables

This commit is contained in:
Émilie Feral
2020-04-15 15:59:29 +02:00
committed by Ecco
parent c2bd19d9a1
commit 675a0d3f4c
8 changed files with 49 additions and 0 deletions

View File

@@ -23,6 +23,8 @@ using namespace Shared;
namespace Probability {
constexpr int CalculationController::k_titleBufferSize;
CalculationController::ContentView::ContentView(SelectableTableView * selectableTableView, Distribution * distribution, Calculation * calculation) :
m_titleView(KDFont::SmallFont, I18n::Message::ComputeProbability, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen),
m_selectableTableView(selectableTableView),

View File

@@ -5,6 +5,8 @@
namespace Shared {
constexpr KDCoordinate FunctionListController::k_minTitleColumnWidth;
FunctionListController::FunctionListController(Responder * parentResponder, ButtonRowController * header, ButtonRowController * footer, I18n::Message text) :
ExpressionModelListController(parentResponder, text),
ButtonRowDelegate(header, footer),

View File

@@ -9,6 +9,9 @@ using namespace Poincare;
namespace Shared {
constexpr int ValuesController::k_maxNumberOfDisplayableRows;
// TODO: use std::abs
static inline int absInt(int x) { return x < 0 ? -x : x; }
// Constructor and helpers

View File

@@ -45,6 +45,7 @@ escher_src += $(addprefix escher/src/,\
message_table_cell_with_message.cpp \
message_table_cell_with_switch.cpp \
message_text_view.cpp \
metric.cpp \
modal_view_controller.cpp \
nested_menu_controller.cpp \
palette.cpp \

View File

@@ -3,6 +3,9 @@
#include <assert.h>
#include <algorithm>
constexpr KDCoordinate ExpressionField::k_maximalHeight;
constexpr KDCoordinate ExpressionField::k_minimalHeight;
ExpressionField::ExpressionField(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, TextFieldDelegate * textFieldDelegate, LayoutFieldDelegate * layoutFieldDelegate) :
Responder(parentResponder),
View(),

33
escher/src/metric.cpp Normal file
View File

@@ -0,0 +1,33 @@
#include <escher/metric.h>
constexpr KDCoordinate Metric::CellMargin;
constexpr KDCoordinate Metric::CommonLeftMargin;
constexpr KDCoordinate Metric::CommonRightMargin;
constexpr KDCoordinate Metric::CommonTopMargin;
constexpr KDCoordinate Metric::CommonBottomMargin;
constexpr KDCoordinate Metric::CommonLargeMargin;
constexpr KDCoordinate Metric::CommonSmallMargin;
constexpr KDCoordinate Metric::TitleBarExternHorizontalMargin;
constexpr KDCoordinate Metric::TitleBarHeight;
constexpr KDCoordinate Metric::ParameterCellHeight;
constexpr KDCoordinate Metric::ModalTopMargin;
constexpr KDCoordinate Metric::ModalBottomMargin;
constexpr KDCoordinate Metric::TableCellVerticalMargin;
constexpr KDCoordinate Metric::TableCellHorizontalMargin;
constexpr KDCoordinate Metric::TabHeight;
constexpr KDCoordinate Metric::ScrollStep;
constexpr KDCoordinate Metric::PopUpLeftMargin;
constexpr KDCoordinate Metric::PopUpRightMargin;
constexpr KDCoordinate Metric::PopUpTopMargin;
constexpr KDCoordinate Metric::ExamPopUpTopMargin;
constexpr KDCoordinate Metric::ExamPopUpBottomMargin;
constexpr KDCoordinate Metric::StoreRowHeight;
constexpr KDCoordinate Metric::ToolboxRowHeight;
constexpr KDCoordinate Metric::StackTitleHeight;
constexpr KDCoordinate Metric::FractionAndConjugateHorizontalOverflow;
constexpr KDCoordinate Metric::FractionAndConjugateHorizontalMargin;
constexpr KDCoordinate Metric::MinimalBracketAndParenthesisHeight;
constexpr KDCoordinate Metric::CellSeparatorThickness;
constexpr KDCoordinate Metric::TableSeparatorThickness;
constexpr KDCoordinate Metric::ExpressionViewHorizontalMargin;
constexpr KDCoordinate Metric::EllipsisCellWidth;

View File

@@ -8,6 +8,9 @@
namespace Poincare {
constexpr KDCoordinate NthRootLayoutNode::k_leftRadixHeight;
constexpr KDCoordinate NthRootLayoutNode::k_leftRadixWidth;
const uint8_t radixPixel[NthRootLayoutNode::k_leftRadixHeight][NthRootLayoutNode::k_leftRadixWidth] = {
{0x51, 0xCC, 0xFF, 0xFF, 0xFF},
{0x96, 0x37, 0xFD, 0xFF, 0xFF},

View File

@@ -19,6 +19,8 @@ extern "C" {
namespace Poincare {
constexpr int PrintFloat::Long::k_maxNumberOfCharsForDigit;
PrintFloat::Long::Long(int64_t i) :
m_negative(i < 0)
{