From 12a47833bbe72d50271bde15c7579c1e801863c2 Mon Sep 17 00:00:00 2001 From: hop311 Date: Thu, 28 Dec 2023 15:16:41 +0000 Subject: Clock refactor + misc small fixes --- src/openvic-simulation/interface/GFX.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/openvic-simulation/interface') diff --git a/src/openvic-simulation/interface/GFX.cpp b/src/openvic-simulation/interface/GFX.cpp index 3624655..d7b9042 100644 --- a/src/openvic-simulation/interface/GFX.cpp +++ b/src/openvic-simulation/interface/GFX.cpp @@ -61,8 +61,8 @@ ProgressBar::ProgressBar() : back_colour {}, progress_colour {} {} bool ProgressBar::_fill_key_map(key_map_t& key_map) { bool ret = Sprite::_fill_key_map(key_map); ret &= add_key_map_entries(key_map, - "color", ONE_EXACTLY, expect_colour(assign_variable_callback(back_colour)), - "colortwo", ONE_EXACTLY, expect_colour(assign_variable_callback(progress_colour)), + "color", ONE_EXACTLY, expect_colour(assign_variable_callback(progress_colour)), + "colortwo", ONE_EXACTLY, expect_colour(assign_variable_callback(back_colour)), "textureFile1", ZERO_OR_ONE, expect_string(assign_variable_callback_string(progress_texture_file)), "textureFile2", ZERO_OR_ONE, expect_string(assign_variable_callback_string(back_texture_file)), "size", ONE_EXACTLY, expect_ivec2(assign_variable_callback(size)), -- cgit v1.2.3-56-ga3b1