X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.cpp;h=da772dc8d21051148ff1aa22f372e3a6590812cc;hb=815194201203afd6fa59e650e1007a355c829544;hp=50c2e774d5477201502f77ac2e98ad270793ad85;hpb=11d1b67a9180a0e468b56e355fbe0c88d104ef72;p=libs%2Fgltk.git

diff --git a/source/style.cpp b/source/style.cpp
index 50c2e77..da772dc 100644
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -6,11 +6,18 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Style::Style(Resources &r):
-	font(&r.get_default_font()),
-	font_size(font->get_native_size())
+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)
@@ -22,20 +29,32 @@ const Part *Style::get_part(const string &name) const
 
 
 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",       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)
+{
+	obj.font = &get_collection().get<GL::Font>(n);
+	obj.font_size = obj.font->get_native_size();
+}
+
 void Style::Loader::font_color(float r, float g, float b)
 {
-	style.font_color = GL::Color(r, g, b);
+	obj.font_color = GL::Color(r, g, b);
 }
 
 void Style::Loader::part()
@@ -46,8 +65,8 @@ void Style::Loader::part()
 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);
 }
 
 } // namespace GLtk