summaryrefslogtreecommitdiff
path: root/framebuffer/font_internal.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-08-01 12:26:57 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2014-08-01 12:26:57 +0100
commitac067e3238a42ecae96f5bdb712e80f754f21044 (patch)
treeca6832f9a0d53c7fdb757daf20c7ccf9af7e7fd4 /framebuffer/font_internal.c
parent6b7e073c580b905325d5a068e143900223b5ac04 (diff)
downloadnetsurf-ac067e3238a42ecae96f5bdb712e80f754f21044.tar.gz
netsurf-ac067e3238a42ecae96f5bdb712e80f754f21044.tar.bz2
Simplify style handling.
Diffstat (limited to 'framebuffer/font_internal.c')
-rw-r--r--framebuffer/font_internal.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c
index 23ef42191..bc17ea595 100644
--- a/framebuffer/font_internal.c
+++ b/framebuffer/font_internal.c
@@ -197,21 +197,14 @@ bool fb_font_finalise(void)
enum fb_font_style
fb_get_font_style(const plot_font_style_t *fstyle)
{
- if (fstyle->weight >= 700) {
- if ((fstyle->flags & FONTF_ITALIC) ||
- (fstyle->flags & FONTF_OBLIQUE)) {
- return FB_BOLD_ITALIC;
- } else {
- return FB_BOLD;
- }
- } else {
- if ((fstyle->flags & FONTF_ITALIC) ||
- (fstyle->flags & FONTF_OBLIQUE)) {
- return FB_ITALIC;
- } else {
- return FB_REGULAR;
- }
- }
+ enum fb_font_style style = FB_REGULAR;
+
+ if (fstyle->weight >= 700)
+ style |= FB_BOLD;
+ if ((fstyle->flags & FONTF_ITALIC) || (fstyle->flags & FONTF_OBLIQUE))
+ style |= FB_ITALIC;
+
+ return style;
}
int