UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/escher] Uniformize k_separatorThickness

Browse Source
This commit is contained in:
Léa Saviot
2019-09-09 18:54:24 +02:00
parent a50c1aafbf
commit 100b0c0186
8 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/battery_view.h
View File

@@ -24,7 +24,7 @@ private:
constexpr static KDCoordinate k_batteryWidth = 15;
constexpr static KDCoordinate k_elementWidth = 1;
constexpr static KDCoordinate k_capHeight = 4;
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
Ion::Battery::Charge m_chargeState;
bool m_isCharging;
bool m_isPlugged;

2
apps/settings/sub_menu/message_table_cell_with_editable_text_with_separator.h
View File

@@ -17,7 +17,7 @@ public:
MessageTableCellWithEditableText * messageTableCellWithEditableText() { return &m_cell; }
constexpr static KDCoordinate k_margin = 10;
private:
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
int numberOfSubviews() const override;
View * subviewAtIndex(int index) override;
void layoutSubviews() override;

2
apps/shared/function_expression_cell.h
View File

@@ -12,7 +12,7 @@ public:
void drawRect(KDContext * ctx, KDRect rect) const override;
void layoutSubviews() override;
private:
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
};
}

2
apps/shared/function_title_cell.h
View File

@@ -23,7 +23,7 @@ public:
void setBaseline(KDCoordinate baseline);
virtual const KDFont * font() const = 0;
protected:
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
constexpr static KDCoordinate k_colorIndicatorThickness = 2;
KDRect subviewFrame() const;
float verticalAlignment() const;

3
escher/include/escher/editable_text_cell.h
View File

@@ -3,6 +3,7 @@
#include <escher/responder.h>
#include <escher/highlight_cell.h>
#include <escher/metric.h>
#include <escher/text_field_delegate.h>
#include <escher/text_field.h>
#include <poincare/print_float.h>
@@ -29,7 +30,7 @@ public:
void didBecomeFirstResponder() override;
KDSize minimalSizeForOptimalDisplay() const override;
private:
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
TextField m_textField;
char m_textBody[Poincare::PrintFloat::k_maxFloatBufferSize];
KDCoordinate m_topMargin;

3
escher/include/escher/expression_field.h
View File

@@ -3,6 +3,7 @@
#include <escher/layout_field.h>
#include <escher/layout_field_delegate.h>
#include <escher/metric.h>
#include <escher/text_field.h>
#include <escher/text_field_delegate.h>
#include <poincare/layout.h>
@@ -41,7 +42,7 @@ private:
static constexpr KDCoordinate k_textFieldHeight = 37;
static constexpr KDCoordinate k_horizontalMargin = 5;
static constexpr KDCoordinate k_verticalMargin = 5;
constexpr static int k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
KDCoordinate inputViewHeight() const;
KDCoordinate maximalHeight() const;
TextField m_textField;

1
escher/include/escher/metric.h
View File

@@ -30,6 +30,7 @@ public:
constexpr static KDCoordinate FractionAndConjugateHorizontalOverflow = 2;
constexpr static KDCoordinate FractionAndConjugateHorizontalMargin = 2;
constexpr static KDCoordinate MinimalBracketAndParenthesisHeight = 18;
constexpr static KDCoordinate CellSeparatorThickness = 1;
constexpr static KDCoordinate TableSeparatorThickness = 5;
constexpr static KDCoordinate ExpressionViewHorizontalMargin = 5;
};

3
escher/include/escher/table_cell.h
View File

@@ -2,6 +2,7 @@
#define ESCHER_TABLE_CELL_H
#include <escher/highlight_cell.h>
#include <escher/metric.h>
class TableCell : public HighlightCell {
public:
@@ -18,7 +19,7 @@ protected:
int numberOfSubviews() const override;
View * subviewAtIndex(int index) override;
void layoutSubviews() override;
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
constexpr static KDCoordinate k_labelMargin = 10;
constexpr static KDCoordinate k_accessoryMargin = 10;
private: