mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

font: use PangoStyle enum

Browse source
This commit is contained in:
Johan Malm 2025-04-23 20:03:14 +01:00 • committed by Johan Malm
parent 94ead35227
commit 58d22d05e2
3 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/common/font.h
View file

@ -5,16 +5,10 @@
struct lab_data_buffer; struct lab_data_buffer;
enum font_slant {
FONT_SLANT_NORMAL = 0,
FONT_SLANT_ITALIC,
FONT_SLANT_OBLIQUE
};
struct font { struct font {
char *name; char *name;
int size; int size;
enum font_slant slant; PangoStyle slant;
PangoWeight weight; PangoWeight weight;
}; };

7
src/common/font.c
View file

@ -17,12 +17,7 @@ font_to_pango_desc(struct font *font)
PangoFontDescription *desc = pango_font_description_new(); PangoFontDescription *desc = pango_font_description_new();
pango_font_description_set_family(desc, font->name); pango_font_description_set_family(desc, font->name);
pango_font_description_set_size(desc, font->size * PANGO_SCALE); pango_font_description_set_size(desc, font->size * PANGO_SCALE);
if (font->slant == FONT_SLANT_ITALIC) { pango_font_description_set_style(desc, font->slant);
pango_font_description_set_style(desc, PANGO_STYLE_ITALIC);
}
if (font->slant == FONT_SLANT_OBLIQUE) {
pango_font_description_set_style(desc, PANGO_STYLE_OBLIQUE);
}
pango_font_description_set_weight(desc, font->weight); pango_font_description_set_weight(desc, font->weight);
return desc; return desc;
} }

8
src/config/rcxml.c
View file

@ -855,11 +855,11 @@ set_font_attr(struct font *font, const char *nodename, const char *content)
font->size = atoi(content); font->size = atoi(content);
} else if (!strcmp(nodename, "slant")) { } else if (!strcmp(nodename, "slant")) {
if (!strcasecmp(content, "italic")) { if (!strcasecmp(content, "italic")) {
font->slant = FONT_SLANT_ITALIC; font->slant = PANGO_STYLE_ITALIC;
} else if (!strcasecmp(content, "oblique")) { } else if (!strcasecmp(content, "oblique")) {
font->slant = FONT_SLANT_OBLIQUE; font->slant = PANGO_STYLE_OBLIQUE;
} else { } else {
font->slant = FONT_SLANT_NORMAL; font->slant = PANGO_STYLE_NORMAL;
} }
} else if (!strcmp(nodename, "weight")) { } else if (!strcmp(nodename, "weight")) {
if (!strcasecmp(content, "thin")) { if (!strcasecmp(content, "thin")) {
@ -1474,7 +1474,7 @@ static void
init_font_defaults(struct font *font) init_font_defaults(struct font *font)
{ {
font->size = 10; font->size = 10;
font->slant = FONT_SLANT_NORMAL; font->slant = PANGO_STYLE_NORMAL;
font->weight = PANGO_WEIGHT_NORMAL; font->weight = PANGO_WEIGHT_NORMAL;
} }