diff options
Diffstat (limited to 'src/ui/ui.cc')
| -rw-r--r-- | src/ui/ui.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/ui/ui.cc b/src/ui/ui.cc index 97b633b..1502419 100644 --- a/src/ui/ui.cc +++ b/src/ui/ui.cc @@ -27,8 +27,10 @@ namespace ui bool UI::ui_debug = false; -float UI::elementmargin = 16; -math::Vector2f UI::elementsize(256, 48); +math::Vector2f UI::elementsize(256, 32); + +float UI::spacing = 16.0f; +float UI::margin = 8.0f; UI *global_ui = 0; @@ -119,8 +121,8 @@ void UI::load_settings() float w = elementsize.width(); float h = elementsize.height(); - float m = elementmargin; - + float m = spacing; + float s = spacing; while (ini.getline()) { @@ -155,8 +157,11 @@ void UI::load_settings() } else if (ini.got_key_float("elementheight", h)) { elementsize.assign(w, h); continue; - } else if (ini.got_key_float("elementmargin", m)) { - elementmargin = m; + } else if (ini.got_key_float("margin", m)) { + margin = m; + continue; + } else if (ini.got_key_float("spacing", s)) { + spacing = s; continue; } else { ini.unknown_key(); |