clean up get_config_cairo_color implementation
This commit is contained in:
		
							parent
							
								
									475f100dac
								
							
						
					
					
						commit
						ed4a3b09c9
					
				
							
								
								
									
										19
									
								
								termite.cc
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								termite.cc
									
									
									
									
									
								
							@ -912,20 +912,13 @@ static bool get_config_color(GKeyFile *config, const char *section, const char *
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static maybe<cairo_pattern_t *>
 | 
					static maybe<cairo_pattern_t *>
 | 
				
			||||||
get_config_cairo_color(GKeyFile *config, const char *group, const char *key) {
 | 
					get_config_cairo_color(GKeyFile *config, const char *group, const char *key) {
 | 
				
			||||||
    maybe<cairo_pattern_t *> ret;
 | 
					    GdkColor color;
 | 
				
			||||||
 | 
					    if (get_config_color(config, group, key, &color)) {
 | 
				
			||||||
    if (auto s = get_config_string(config, group, key)) {
 | 
					        return cairo_pattern_create_rgb(color.red   / 65535.0,
 | 
				
			||||||
        GdkColor color;
 | 
					                                        color.green / 65535.0,
 | 
				
			||||||
        if (gdk_color_parse(*s, &color)) {
 | 
					                                        color.blue  / 65535.0);
 | 
				
			||||||
            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);
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    return ret;
 | 
					    return {};
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void load_theme(VteTerminal *vte, GKeyFile *config) {
 | 
					static void load_theme(VteTerminal *vte, GKeyFile *config) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user