diff options
author | Jari Vetoniemi <mailroxas@gmail.com> | 2015-01-17 15:25:50 +0200 |
---|---|---|
committer | Jari Vetoniemi <mailroxas@gmail.com> | 2015-01-17 15:25:50 +0200 |
commit | 6ac8d8c4d8b12b37e664fd1d0c034c8fdef9c5f4 (patch) | |
tree | 090a8fb647f744d22429479ff11933cf72ef14b1 /lib/menu.c | |
parent | 96cc64a597b9cac555289f472e1867a220007e7a (diff) | |
download | bemenu-6ac8d8c4d8b12b37e664fd1d0c034c8fdef9c5f4.tar.gz bemenu-6ac8d8c4d8b12b37e664fd1d0c034c8fdef9c5f4.tar.bz2 bemenu-6ac8d8c4d8b12b37e664fd1d0c034c8fdef9c5f4.zip |
Change font functions to function on pango style font descriptions instead of size
and name.
Diffstat (limited to 'lib/menu.c')
-rw-r--r-- | lib/menu.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -9,7 +9,7 @@ /** * Default font. */ -static const char *default_font = "Terminus"; +static const char *default_font = "Terminus 9"; /** * Default hexadecimal colors. @@ -78,7 +78,7 @@ bm_menu_new(const char *renderer, enum bm_prioritory prioritory) if (!menu->renderer) goto fail; - if (!bm_menu_set_font(menu, NULL, 0)) + if (!bm_menu_set_font(menu, NULL)) goto fail; for (uint32_t i = 0; i < BM_COLOR_LAST; ++i) { @@ -232,7 +232,7 @@ bm_menu_get_title(const struct bm_menu *menu) } bool -bm_menu_set_font(struct bm_menu *menu, const char *font, uint32_t size) +bm_menu_set_font(struct bm_menu *menu, const char *font) { assert(menu); @@ -244,15 +244,13 @@ bm_menu_set_font(struct bm_menu *menu, const char *font, uint32_t size) free(menu->font.name); menu->font.name = copy; - menu->font.size = (size > 0 ? size : 12); return true; } const char* -bm_menu_get_font(const struct bm_menu *menu, uint32_t *out_size) +bm_menu_get_font(const struct bm_menu *menu) { assert(menu); - if (out_size) *out_size = menu->font.size; return menu->font.name; } |