aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/interface/GUI.cpp
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-08-11 00:40:07 +0200
committer hop311 <hop3114@gmail.com>2024-08-14 00:07:46 +0200
commit7e05aaccf0e13299702ddeed17661831c3ddc692 (patch)
treeb85022a240a4a24c0ee0fd44cd59ff6bc112c18f /src/openvic-simulation/interface/GUI.cpp
parent9f9c5844bfedc5e366a35cdba386027fb9f3a14a (diff)
Assorted minor fixes (clang-format.sh shebang, parse national foci scripts, factor song chance, update openvic-dataloader)assorted-fixes
Diffstat (limited to 'src/openvic-simulation/interface/GUI.cpp')
-rw-r--r--src/openvic-simulation/interface/GUI.cpp6
1 files changed, 2 insertions, 4 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;
}