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

diff --git a/source/style.cpp b/source/style.cpp
index 6c11657..50c2e77 100644
--- 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,10 +6,20 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Style::Style():
-	font(0)
+Style::Style(Resources &r):
+	font(&r.get_default_font()),
+	font_size(font->get_native_size())
 { }
 
+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),
@@ -24,12 +27,20 @@ Style::Loader::Loader(Style &s, Resources &r):
 {
 	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)