Font size loading fixes

When a font is specified, reset font size as well.

Add a font_size statement for overriding the size.

diff --git a/source/style.cpp b/source/style.cpp
index 001b36937e03f4ab03261043d3414ae9ce49060e..44ad4144931daf223fb96e8bca478a35a4b8063a 100644 (file)
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -38,14 +38,21 @@ Style::Loader::Loader(Style &s, Resources &r):
                style.font_size = style.font->get_native_size();
        }
 
-       add("font",       &Style::font);
+       add("font",       &Loader::font);
        add("font_color", &Loader::font_color);
+       add("font_size",  &Style::font_size);
        add("part",       static_cast<void (Loader::*)()>(&Loader::part));
        add("part",       static_cast<void (Loader::*)(const std::string &)>(&Loader::part));
        // Deprecated alias
        add("special",    static_cast<void (Loader::*)(const std::string &)>(&Loader::part));
 }
 
+void Style::Loader::font(const string &n)
+{
+       style.font = &res.get<GL::Font>(n);
+       style.font_size = style.font->get_native_size();
+}
+
 void Style::Loader::font_color(float r, float g, float b)
 {
        style.font_color = GL::Color(r, g, b);