diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-28 17:43:43 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-28 17:43:43 +0100 |
| commit | 0a425fbe05d6138b753c0e4a7c06f06695bde8af (patch) | |
| tree | 8f67577b0101c06e2a7cc4d4c277d686d16d3d75 /src/openvic-simulation/interface | |
| parent | 56a865d7d0868b785eb6b9b723f0e52f65e6457d (diff) | |
| parent | 12a47833bbe72d50271bde15c7579c1e801863c2 (diff) | |
Merge pull request #110 from OpenVicProject/clock-refactor
Clock refactor + misc small fixes
Diffstat (limited to 'src/openvic-simulation/interface')
| -rw-r--r-- | src/openvic-simulation/interface/GFX.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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)), |