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] Fix Stores margins

Browse Source
This commit is contained in:
Léa Saviot
2019-09-04 11:30:22 +02:00
parent f4bbab76ed
commit 553c649a80
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/regression/store_controller.cpp
View File

@@ -41,7 +41,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int
}
Shared::StoreTitleCell * mytitleCell = static_cast<Shared::StoreTitleCell *>(cell);
bool isValuesColumn = i%Store::k_numberOfColumnsPerSeries == 0;
mytitleCell->setSeparatorLeft(isValuesColumn);
mytitleCell->setSeparatorLeft(isValuesColumn && i > 0);
int seriesIndex = i/Store::k_numberOfColumnsPerSeries;
mytitleCell->setColor(m_store->numberOfPairsOfSeries(seriesIndex) == 0 ? Palette::GreyDark : Store::colorOfSeriesAtIndex(seriesIndex)); // TODO Share GreyDark with graph/list_controller and statistics/store_controller
char name[] = {isValuesColumn ? 'X' : 'Y', static_cast<char>('1' + seriesIndex), 0};

2
apps/shared/store_controller.cpp
View File

@@ -148,7 +148,7 @@ int StoreController::typeAtLocation(int i, int j) {
void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
// Handle the separator
if (typeAtLocation(i, j) == k_editableCellType) {
bool shouldHaveLeftSeparator = i % DoublePairStore::k_numberOfColumnsPerSeries == 0;
bool shouldHaveLeftSeparator = i > 0 && ( i % DoublePairStore::k_numberOfColumnsPerSeries == 0);
static_cast<StoreCell *>(cell)->setSeparatorLeft(shouldHaveLeftSeparator);
}
// Handle hidden cells

4
apps/shared/store_controller.h
View File

@@ -46,8 +46,6 @@ public:
protected:
static constexpr KDCoordinate k_cellWidth = 116;
static constexpr KDCoordinate k_margin = 8;
static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin;
constexpr static int k_maxNumberOfEditableCells = (Ion::Display::Width/k_cellWidth+2) * ((Ion::Display::Height - Metric::TitleBarHeight - Metric::TabHeight)/k_cellHeight+2);
constexpr static int k_numberOfTitleCells = 4;
static constexpr int k_titleCellType = 0;
@@ -62,7 +60,7 @@ protected:
// Responder
void didBecomeFirstResponder() override;
private:
static constexpr KDCoordinate k_margin = 8;
static constexpr KDCoordinate k_margin = 5;
static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin;
static constexpr KDCoordinate k_formulaInputHeight = 31;
int numberOfSubviews() const override { return 1 + m_displayFormulaInputView; }

2
apps/statistics/store_controller.cpp
View File

@@ -44,7 +44,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int
}
Shared::StoreTitleCell * mytitleCell = static_cast<Shared::StoreTitleCell *>(cell);
bool isValuesColumn = i%Store::k_numberOfColumnsPerSeries == 0;
mytitleCell->setSeparatorLeft(isValuesColumn);
mytitleCell->setSeparatorLeft(i > 0 && isValuesColumn);
int seriesIndex = i/Store::k_numberOfColumnsPerSeries;
assert(seriesIndex >= 0 && seriesIndex < DoublePairStore::k_numberOfSeries);
if (isValuesColumn) {

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

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