thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-01 10:38:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor font creation to save stack (#1707)

Browse Source
This commit is contained in:
Stanislav Meduna
2021-05-23 22:24:54 +02:00
committed by GitHub
parent 8d8d421286
commit 063d9c47a4
5 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/display/display_buffer.h
+12 -9
View File
@@ -338,10 +338,18 @@ class DisplayPage {
DisplayPage *next_{nullptr};
};
struct GlyphData {
const char *a_char;
const uint8_t *data;
int offset_x;
int offset_y;
int width;
int height;
};
class Glyph {
public:
Glyph(const char *a_char, const uint8_t *data_start, uint32_t offset, int offset_x, int offset_y, int width,
int height);
Glyph(const GlyphData *data) : glyph_data_(data) {}
bool get_pixel(int x, int y) const;
@@ -357,12 +365,7 @@ class Glyph {
friend Font;
friend DisplayBuffer;
const char *char_;
const uint8_t *data_;
int offset_x_;
int offset_y_;
int width_;
int height_;
const GlyphData *glyph_data_;
};
class Font {
@@ -373,7 +376,7 @@ class Font {
* @param baseline The y-offset from the top of the text to the baseline.
* @param bottom The y-offset from the top of the text to the bottom (i.e. height).
*/
Font(std::vector<Glyph> &&glyphs, int baseline, int bottom);
Font(const GlyphData *data, int data_nr, int baseline, int bottom);
int match_next_glyph(const char *str, int *match_length);