takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up get_config_cairo_color implementation

This commit is contained in:
Daniel Micay 2012-11-14 20:06:28 -05:00
parent 475f100dac
commit ed4a3b09c9
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
termite.cc
View File

@ -912,20 +912,13 @@ static bool get_config_color(GKeyFile *config, const char *section, const char *
static maybe<cairo_pattern_t *>
get_config_cairo_color(GKeyFile *config, const char *group, const char *key) {
maybe<cairo_pattern_t *> ret;
if (auto s = get_config_string(config, group, key)) {
GdkColor color;
if (gdk_color_parse(*s, &color)) {
ret = cairo_pattern_create_rgb(color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
} else {
g_printerr("invalid color string: %s\n", *s);
}
g_free(*s);
GdkColor color;
if (get_config_color(config, group, key, &color)) {
return cairo_pattern_create_rgb(color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
}
return ret;
return {};
}
static void load_theme(VteTerminal *vte, GKeyFile *config) {