From b6e20e04b519e50909331f537df2ea6114a137ee Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sat, 23 Jul 2016 19:16:28 +0200 Subject: General ui code improvements, moved layout related variables to ui::UI, added ColorPicker widget. --- src/ui/ui.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/ui/ui.cc') diff --git a/src/ui/ui.cc b/src/ui/ui.cc index 1502419..0877519 100644 --- a/src/ui/ui.cc +++ b/src/ui/ui.cc @@ -29,8 +29,10 @@ bool UI::ui_debug = false; math::Vector2f UI::elementsize(256, 32); -float UI::spacing = 16.0f; -float UI::margin = 8.0f; +float UI::padding = 24.0f; +float UI::margin = 16.0f; + +float UI::pointer_size = 48.0f; UI *global_ui = 0; @@ -121,8 +123,9 @@ void UI::load_settings() float w = elementsize.width(); float h = elementsize.height(); - float m = spacing; - float s = spacing; + float m = margin; + float s = padding; + float p = pointer_size; while (ini.getline()) { @@ -160,8 +163,11 @@ void UI::load_settings() } else if (ini.got_key_float("margin", m)) { margin = m; continue; - } else if (ini.got_key_float("spacing", s)) { - spacing = s; + } else if (ini.got_key_float("pointer", p)) { + pointer_size = p; + continue; + } else if (ini.got_key_float("padding", s)) { + padding = s; continue; } else { ini.unknown_key(); -- cgit v1.2.3