the table is int its palce
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
#include "HardwareSerial.h"
|
#include "HardwareSerial.h"
|
||||||
#include "UIDecorations.h"
|
#include "UIDecorations.h"
|
||||||
#include "UIDrawing.h"
|
#include "UIDrawing.h"
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
#define DEBUG
|
#define DEBUG
|
||||||
|
|
||||||
@@ -12,6 +13,8 @@ UITable::UITable(Arduino_GFX *gfx, UIDimensions dims, UIDecorations *decor,
|
|||||||
|
|
||||||
// Default decoration for every cell
|
// Default decoration for every cell
|
||||||
UIDecorations *cellDecor = new UIDecorations();
|
UIDecorations *cellDecor = new UIDecorations();
|
||||||
|
cellDecor->textSize = 2;
|
||||||
|
this->decor->textSize = 2;
|
||||||
|
|
||||||
for (int k = 0; k < ROWS * COLUMNS; k++) {
|
for (int k = 0; k < ROWS * COLUMNS; k++) {
|
||||||
this->tableData[k].decor = cellDecor;
|
this->tableData[k].decor = cellDecor;
|
||||||
@@ -21,6 +24,15 @@ UITable::UITable(Arduino_GFX *gfx, UIDimensions dims, UIDecorations *decor,
|
|||||||
this->tableData[k].dims.height = 0;
|
this->tableData[k].dims.height = 0;
|
||||||
this->tableData[k].display = this->display;
|
this->tableData[k].display = this->display;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int cellH = CHR_HEIGHT(this->decor->textSize) + CELL_MARGIN;
|
||||||
|
|
||||||
|
// Initialize the table dimensions
|
||||||
|
this->dims.height = ROWS * cellH + this->getTitleAreaHeight() +
|
||||||
|
DEFAULT_MARGIN + DEFAULT_BORDER_THICKNESS;
|
||||||
|
this->dims.width =
|
||||||
|
(DEFAULT_BORDER_THICKNESS + DEFAULT_MARGIN) * 2 +
|
||||||
|
(CHR_WIDTH(this->decor->textSize) + CELL_MARGIN) * (3 + 24 + 5);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t UITable::getContentAreaHeight() {
|
uint16_t UITable::getContentAreaHeight() {
|
||||||
@@ -35,9 +47,9 @@ uint16_t UITable::getContentAreaHeight() {
|
|||||||
*/
|
*/
|
||||||
void UITable::setup() {
|
void UITable::setup() {
|
||||||
// Define the cell dimensions
|
// Define the cell dimensions
|
||||||
int tableCellW[] = {3 * (CHR_WIDTH(this->decor->textSize) + 2),
|
int tableCellW[] = {3 * (CHR_WIDTH(this->decor->textSize) + CELL_MARGIN),
|
||||||
24 * (CHR_WIDTH(this->decor->textSize) + 2),
|
24 * (CHR_WIDTH(this->decor->textSize) + CELL_MARGIN),
|
||||||
5 * (CHR_WIDTH(this->decor->textSize) + 2)};
|
5 * (CHR_WIDTH(this->decor->textSize) + CELL_MARGIN)};
|
||||||
int cellH = CHR_HEIGHT(this->decor->textSize) + CELL_MARGIN;
|
int cellH = CHR_HEIGHT(this->decor->textSize) + CELL_MARGIN;
|
||||||
|
|
||||||
// Initialize the cells
|
// Initialize the cells
|
||||||
@@ -60,15 +72,4 @@ void UITable::setup() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize the table dimensions
|
|
||||||
this->dims.height = ROWS * cellH + this->getTitleAreaHeight();
|
|
||||||
this->dims.width =
|
|
||||||
(3 + 24 + 5 + CELL_MARGIN) * CHR_WIDTH(this->decor->textSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
void UITable::initDimensions() {
|
|
||||||
// Calculate the height
|
|
||||||
|
|
||||||
// Calculate the width
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ struct UITable : UIElement {
|
|||||||
UITable(Arduino_GFX *gfx, UIDimensions dims, UIDecorations *decor, char *t);
|
UITable(Arduino_GFX *gfx, UIDimensions dims, UIDecorations *decor, char *t);
|
||||||
|
|
||||||
// void Update(StandingLine standings[5]);
|
// void Update(StandingLine standings[5]);
|
||||||
void initDimensions();
|
|
||||||
void setup();
|
void setup();
|
||||||
|
|
||||||
// Getters
|
// Getters
|
||||||
|
|||||||
@@ -77,6 +77,10 @@ void setup() {
|
|||||||
|
|
||||||
// Setup the relative
|
// Setup the relative
|
||||||
relativeDecor->textSize = 2;
|
relativeDecor->textSize = 2;
|
||||||
|
relative.dims.x = gfx->width() - relative.dims.width;
|
||||||
|
relative.dims.y = gfx->height() - relative.dims.height;
|
||||||
|
// relative.dims.x = 250;
|
||||||
|
// relative.dims.y = 250;
|
||||||
relative.setup();
|
relative.setup();
|
||||||
relative.drawBox();
|
relative.drawBox();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user