X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.cpp;h=369559d8095b358bac335e2fb2c5727eabbe0206;hb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;hp=001b36937e03f4ab03261043d3414ae9ce49060e;hpb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;p=libs%2Fgltk.git

diff --git a/source/style.cpp b/source/style.cpp
index 001b369..369559d 100644
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -18,6 +18,14 @@ const GL::Font &Style::get_font() const
 	return *font;
 }
 
+const GL::Color &Style::get_font_color(State s) const
+{
+	if(s>N_STATES_)
+		throw invalid_argument("Style::get_font_color");
+
+	return font_color[s];
+}
+
 const Part *Style::get_part(const string &name) const
 {
 	for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
@@ -29,38 +37,50 @@ 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)
 {
-	if(!style.font)
+	if(!obj.font)
 	{
-		style.font = &r.get_default_font();
-		style.font_size = style.font->get_native_size();
+		obj.font = &get_collection().get_default_font();
+		obj.font_size = obj.font->get_native_size();
 	}
 
-	add("font",       &Style::font);
+	add("font",       &Loader::font);
+	add("font_color", &Loader::font_color_normal);
 	add("font_color", &Loader::font_color);
-	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));
+	add("font_size",  &Style::font_size);
+	add("part",       &Loader::part);
+	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_normal(float r, float g, float b)
 {
-	part(string());
+	font_color(NORMAL, r, g, b);
+}
+
+void Style::Loader::font_color(State s, float r, float g, float b)
+{
+	for(unsigned i=0; i<N_STATES_; ++i)
+		if((i&s)==s)
+			obj.font_color[i] = 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