diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2021-02-28 21:00:13 +0100 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2021-02-28 21:00:13 +0100 |
| commit | 82a6206422ed658a99716fbd18e33942cebc833b (patch) | |
| tree | f849699cd7a31175c57c3d9583d2162786138e3c /fw/fe310/eos/eve/widget/label.c | |
| parent | 6a4c8a1f11f6a7bd57b0fd618f455bcdecbfe538 (diff) | |
font property moved to widget base
Diffstat (limited to 'fw/fe310/eos/eve/widget/label.c')
| -rw-r--r-- | fw/fe310/eos/eve/widget/label.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fw/fe310/eos/eve/widget/label.c b/fw/fe310/eos/eve/widget/label.c index 728f0bb..c52027c 100644 --- a/fw/fe310/eos/eve/widget/label.c +++ b/fw/fe310/eos/eve/widget/label.c @@ -1,16 +1,17 @@ #include <stdlib.h> #include <string.h> +#include "unicode.h" + #include "eve.h" #include "eve_kbd.h" -#include "unicode.h" +#include "eve_font.h" #include "screen/screen.h" #include "screen/window.h" #include "screen/view.h" #include "screen/page.h" -#include "font.h" #include "label.h" void eve_label_init(EVELabel *label, EVERect *g, EVEFont *font, char *title) { @@ -18,7 +19,6 @@ void eve_label_init(EVELabel *label, EVERect *g, EVEFont *font, char *title) { if (g) label->g = *g; label->font = font; label->title = title; - if (label->g.w == 0) label->g.w = eve_font_str_w(font, label->title); if (label->g.h == 0) label->g.h = eve_font_h(font); } |