Add getter for Panel::layout

[libs/gltk.git] / source / style.cpp

diff --git a/source/style.cpp b/source/style.cpp
index 0d6e424e2163b048d65c3c76af46b7792cb87acc..f26112a6c14c688674b13cc7adb40c415adcc151 100644 (file)
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "resources.h"
 #include "style.h"
 
@@ -13,38 +6,65 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Style::Style(Resources &r):
-       font(&r.get_default_font())
+Style::Style():
+       font(0),
+       font_size(0)
 { }
 
+const GL::Font &Style::get_font() const
+{
+       if(!font)
+               throw logic_error("!font");
+       return *font;
+}
+
+const Part *Style::get_part(const string &name) const
+{
+       for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+               if(i->get_name()==name)
+                       return &*i;
+
+       return 0;
+}
+
 
 Style::Loader::Loader(Style &s, Resources &r):
-       style(s),
-       res(r)
+       DataFile::CollectionObjectLoader<Style, Resources>(s, &r)
 {
-       add("font",       &Style::font);
+       if(!obj.font)
+       {
+               obj.font = &get_collection().get_default_font();
+               obj.font_size = obj.font->get_native_size();
+       }
+
+       add("font",       &Loader::font);
        add("font_color", &Loader::font_color);
+       add("font_size",  &Style::font_size);
        add("part",       &Loader::part);
-       add("special",    &Loader::special);
+       add("part",       &Loader::unnamed_part);
 }
 
-void Style::Loader::font_color(float r, float g, float b)
+void Style::Loader::font(const string &n)
 {
-       style.font_color=GL::Color(r, g, b);
+       obj.font = &get_collection().get<GL::Font>(n);
+       obj.font_size = obj.font->get_native_size();
 }
 
-void Style::Loader::part()
+void Style::Loader::font_color(float r, float g, float b)
 {
-       Part p((string()));
-       load_sub(p, res);
-       style.parts.push_back(p);
+       obj.font_color = GL::Color(r, g, b);
 }
 
-void Style::Loader::special(const string &n)
+void Style::Loader::part(const string &n)
 {
        Part p(n);
-       load_sub(p, res);
-       style.parts.push_back(p);
+       load_sub(p, get_collection());
+       obj.parts.push_back(p);
+}
+
+void Style::Loader::unnamed_part()
+{
+       part(string());
 }
 
 } // namespace GLtk