X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.cpp;h=f26112a6c14c688674b13cc7adb40c415adcc151;hb=c8291177b545ec81930603a5915234a60296db51;hp=b4ee82d10eff5d1e454ebf767430d0edd941ed17;hpb=d7ae291415a21cc886fe318070b41ac8d3e57a30;p=libs%2Fgltk.git

diff --git a/source/style.cpp b/source/style.cpp
index b4ee82d..f26112a 100644
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -7,29 +7,64 @@ namespace Msp {
 namespace GLtk {
 
 Style::Style():
-	font(0)
+	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("part",       &Loader::unnamed_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(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