aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/interface/GUI.cpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2024-02-19 22:09:17 +0100
committer GitHub <noreply@github.com>2024-02-19 22:09:17 +0100
commit147e0a772dc768bd90fdccdd2536f14c11238d57 (patch)
treeaef9a168b1e4ce5b15797bca460abda5edf465c0 /src/openvic-simulation/interface/GUI.cpp
parent35e5f7828a41736194362186ad4f946fad5964d1 (diff)
parent31a3521643dbf4bd218a6af10025f99ac3bf7e98 (diff)
Merge pull request #149 from OpenVicProject/fp-rounding+texture-sprites
Fixed point rounding and Texture Sprites
Diffstat (limited to 'src/openvic-simulation/interface/GUI.cpp')
-rw-r--r--src/openvic-simulation/interface/GUI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/interface/GUI.cpp b/src/openvic-simulation/interface/GUI.cpp
index 94e1fe3..ae4cf0e 100644
--- a/src/openvic-simulation/interface/GUI.cpp
+++ b/src/openvic-simulation/interface/GUI.cpp
@@ -240,7 +240,7 @@ bool TextEditBox::_fill_key_map(NodeTools::case_insensitive_key_map_t& key_map,
Scrollbar::Scrollbar()
: slider_button_name {}, track_button_name {}, less_button_name{}, more_button_name {}, size {}, border_size {},
- min_value {}, max_value {}, step_size {}, start_value {}, horizontal { false }, use_range_limit { false },
+ min_value {}, max_value {}, step_size {}, start_value {}, horizontal { false }, range_limited { false },
range_limit_min {}, range_limit_max {}, range_limit_min_icon_name {}, range_limit_max_icon_name {} {
scrollbar_elements.reserve(4); /* Space for 4 buttons, might need 2 more for range limit icons. */
}
@@ -262,7 +262,7 @@ bool Scrollbar::_fill_key_map(NodeTools::case_insensitive_key_map_t& key_map, UI
"stepSize", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(step_size)),
"startValue", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(start_value)),
"horizontal", ONE_EXACTLY, expect_int_bool(assign_variable_callback(horizontal)),
- "useRangeLimit", ZERO_OR_ONE, expect_bool(assign_variable_callback(use_range_limit)),
+ "useRangeLimit", ZERO_OR_ONE, expect_bool(assign_variable_callback(range_limited)),
"rangeLimitMin", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(range_limit_min)),
"rangeLimitMax", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(range_limit_max)),
"rangeLimitMinIcon", ZERO_OR_ONE, expect_string(assign_variable_callback_string(range_limit_min_icon_name)),