diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-03-21 00:31:05 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-03-21 00:31:05 +0100 |
| commit | 020ada6c8f0f1bf4486fd9e76ec29673044794d6 (patch) | |
| tree | 5dc9698964d3980680dad3127fb53ecd4a600c5f /src/openvic-simulation/interface/GUI.cpp | |
| parent | eece77afebf0e4d36b4c9ace3b1044f2c3da50f1 (diff) | |
| parent | 6a99bd8237fa61bd740ba482b59ff428a7e2f123 (diff) | |
Merge pull request #152 from OpenVicProject/pop-menu
GUI and Pop attribute work for Population Menu
Diffstat (limited to 'src/openvic-simulation/interface/GUI.cpp')
| -rw-r--r-- | src/openvic-simulation/interface/GUI.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/interface/GUI.cpp b/src/openvic-simulation/interface/GUI.cpp index ae4cf0e..9acb72c 100644 --- a/src/openvic-simulation/interface/GUI.cpp +++ b/src/openvic-simulation/interface/GUI.cpp @@ -174,7 +174,7 @@ bool AlignedElement::_fill_key_map(NodeTools::case_insensitive_key_map_t& key_ma return ret; } -Text::Text() : text {}, font { nullptr }, max_size {} {} +Text::Text() : text {}, font { nullptr }, max_size {}, border_size {} {} bool Text::_fill_key_map(NodeTools::case_insensitive_key_map_t& key_map, UIManager const& ui_manager) { bool ret = AlignedElement::_fill_key_map(key_map, ui_manager); @@ -183,8 +183,8 @@ bool Text::_fill_key_map(NodeTools::case_insensitive_key_map_t& key_map, UIManag "font", ONE_EXACTLY, ui_manager.expect_font_string(assign_variable_callback_pointer(font)), "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)), - "borderSize", ZERO_OR_ONE, success_callback, "fixedsize", ZERO_OR_ONE, success_callback, "allwaystransparent", ZERO_OR_ONE, success_callback, |