diff options
| author | Alex Auvolat <alex@adnab.me> | 2015-12-28 12:43:53 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2015-12-29 14:26:21 +0100 |
| commit | c6a4e4519fb000fe835486bcb02f3253e4316a3b (patch) | |
| tree | 5e5124c7f59e10e326d20410a20361cb6092696d /i3-config-wizard | |
| parent | 0ee9e65a3b933b563902e1e85b5f25cbff82fc81 (diff) | |
| download | i3-c6a4e4519fb000fe835486bcb02f3253e4316a3b.tar.gz i3-c6a4e4519fb000fe835486bcb02f3253e4316a3b.zip | |
Correct color management for pango fonts
Corrects the cases where the colorpixel is not 0xRRGGBB : we have to
use the full color_t struct to describe font colors, as Pango expects
RGB values and not an XCB colorpixel value.
Diffstat (limited to 'i3-config-wizard')
| -rw-r--r-- | i3-config-wizard/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c index bd12cd81..284f15fa 100644 --- a/i3-config-wizard/main.c +++ b/i3-config-wizard/main.c @@ -479,7 +479,7 @@ static int handle_expose() { if (current_step == STEP_WELCOME) { /* restore font color */ - set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000")); txt(logical_px(10), 2, "You have not configured i3 yet."); txt(logical_px(10), 3, "Do you want me to generate a config at"); @@ -493,16 +493,16 @@ static int handle_expose() { txt(logical_px(85), 8, "No, I will use the defaults"); /* green */ - set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#00FF00"), draw_util_hex_to_color("#000000")); txt(logical_px(25), 6, "<Enter>"); /* red */ - set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#FF0000"), draw_util_hex_to_color("#000000")); txt(logical_px(31), 8, "<ESC>"); } if (current_step == STEP_GENERATE) { - set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000")); txt(logical_px(10), 2, "Please choose either:"); txt(logical_px(85), 4, "Win as default modifier"); @@ -519,7 +519,7 @@ static int handle_expose() { /* the selected modifier */ set_font(&bold_font); - set_font_colors(pixmap_gc, get_colorpixel("#FFFFFF"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#FFFFFF"), draw_util_hex_to_color("#000000")); if (modifier == MOD_Mod4) txt(logical_px(10), 4, "-> <Win>"); else @@ -527,11 +527,11 @@ static int handle_expose() { /* green */ set_font(&font); - set_font_colors(pixmap_gc, get_colorpixel("#00FF00"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#00FF00"), draw_util_hex_to_color("#000000")); txt(logical_px(25), 9, "<Enter>"); /* red */ - set_font_colors(pixmap_gc, get_colorpixel("#FF0000"), get_colorpixel("#000000")); + set_font_colors(pixmap_gc, draw_util_hex_to_color("#FF0000"), draw_util_hex_to_color("#000000")); txt(logical_px(31), 10, "<ESC>"); } |