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

diff --git a/source/style.cpp b/source/style.cpp
index b4ee82d..001b369 100644
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -7,22 +7,53 @@ 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)
 {
+	if(!style.font)
+	{
+		style.font = &r.get_default_font();
+		style.font_size = style.font->get_native_size();
+	}
+
 	add("font",       &Style::font);
 	add("font_color", &Loader::font_color);
-	add("part",       &Loader::part);
+	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_color(float r, float g, float b)
 {
-	style.font_color=GL::Color(r, g, b);
+	style.font_color = GL::Color(r, g, b);
+}
+
+void Style::Loader::part()
+{
+	part(string());
 }
 
 void Style::Loader::part(const string &n)