From e5e89c4800e2493bd5de47306241cd586bf53632 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Mon, 27 May 2024 13:09:10 +0200 Subject: [PATCH] all color names are now accepted in parsecolor --- util.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util.cpp b/util.cpp index 12047f09..4d5b952e 100644 --- a/util.cpp +++ b/util.cpp @@ -577,8 +577,10 @@ color_t exp_parser::parsecolor(int prio) { } string token = next_token(); if(params.count(token)) return (color_t) real(params[token]->get_cld()); - if(token == "black") return 0x000000FF; - if(token == "white") return 0xFFFFFFFF; + + auto p = find_color_by_name(s); + if(p) return (p->second << 8) | 0xFF; + color_t res; if(s.size() == 6) { int qty = sscanf(s.c_str(), "%x", &res);