From 2ee5e74365fb6214b4c6a1a14ebc54d00e36288f Mon Sep 17 00:00:00 2001 From: hop311 Date: Mon, 19 Aug 2024 22:17:13 +0100 Subject: Store universal colour codes (first loaded) --- src/openvic-simulation/interface/UI.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/openvic-simulation/interface/UI.cpp') diff --git a/src/openvic-simulation/interface/UI.cpp b/src/openvic-simulation/interface/UI.cpp index db7e78a..03166b1 100644 --- a/src/openvic-simulation/interface/UI.cpp +++ b/src/openvic-simulation/interface/UI.cpp @@ -23,10 +23,20 @@ bool UIManager::add_font( Logger::error("Invalid fontname for font ", identifier, " - empty!"); return false; } - return fonts.add_item( + const bool ret = fonts.add_item( { identifier, colour, fontname, charset, height, std::move(colour_codes) }, duplicate_warning_callback ); + + if (universal_colour_codes.empty() && ret) { + GFX::Font::colour_codes_t const& loaded_colour_codes = get_fonts().back().get_colour_codes(); + if (!loaded_colour_codes.empty()) { + universal_colour_codes = loaded_colour_codes; + Logger::info("Loaded universal colour codes from font: \"", identifier, "\""); + } + } + + return ret; } bool UIManager::_load_font(ast::NodeCPtr node) { -- cgit v1.2.3-56-ga3b1