diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-08-14 00:22:01 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-08-14 00:22:01 +0200 |
| commit | 53bf0ac14be0fd7a049306d6e20c01030916fdc6 (patch) | |
| tree | b85022a240a4a24c0ee0fd44cd59ff6bc112c18f /src/openvic-simulation/interface | |
| parent | 9f9c5844bfedc5e366a35cdba386027fb9f3a14a (diff) | |
| parent | 7e05aaccf0e13299702ddeed17661831c3ddc692 (diff) | |
Merge pull request #185 from OpenVicProject/assorted-fixes
Assorted minor fixes (clang-format.sh shebang, parse national foci sc…
Diffstat (limited to 'src/openvic-simulation/interface')
| -rw-r--r-- | src/openvic-simulation/interface/GUI.cpp | 6 | ||||
| -rw-r--r-- | src/openvic-simulation/interface/GUI.hpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/openvic-simulation/interface/GUI.cpp b/src/openvic-simulation/interface/GUI.cpp index 87e3624..4f42b86 100644 --- a/src/openvic-simulation/interface/GUI.cpp +++ b/src/openvic-simulation/interface/GUI.cpp @@ -184,12 +184,10 @@ bool Text::_fill_key_map(NodeTools::case_insensitive_key_map_t& key_map, UIManag "maxWidth", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(max_size.x)), "maxHeight", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(max_size.y)), "borderSize", ZERO_OR_ONE, expect_fvec2(assign_variable_callback(border_size)), + "textureFile", ZERO_OR_ONE, expect_string(assign_variable_callback_string(texture_file), true), "fixedsize", ZERO_OR_ONE, success_callback, - "allwaystransparent", ZERO_OR_ONE, success_callback, - - // Add warning about redundant key? - "textureFile", ZERO_OR_ONE, success_callback + "allwaystransparent", ZERO_OR_ONE, success_callback ); return ret; } diff --git a/src/openvic-simulation/interface/GUI.hpp b/src/openvic-simulation/interface/GUI.hpp index 4e1b062..a86d432 100644 --- a/src/openvic-simulation/interface/GUI.hpp +++ b/src/openvic-simulation/interface/GUI.hpp @@ -203,8 +203,9 @@ namespace OpenVic::GUI { GFX::Font const* PROPERTY(font); fvec2_t PROPERTY(max_size); /* Defines keys: maxWidth, maxHeight */ fvec2_t PROPERTY(border_size); + std::string PROPERTY(texture_file); - // TODO - fixedsize, textureFile + // TODO - fixedsize protected: Text(); |