X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=302551422e9a5bd9409eae4624cada8373ce04af;hb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;hp=56f7ac484afce3e94fd2ee4b639b70466e32eeeb;hpb=4ab33a06c9f8a85b193d7db8bc6ee9b8895aab09;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index 56f7ac4..3025514 100644
--- a/source/style.h
+++ b/source/style.h
@@ -3,7 +3,7 @@
 
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "part.h"
 
 namespace Msp {
@@ -18,23 +18,17 @@ generic properties.
 class Style
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Style, Resources>
 	{
-	private:
-		Style &style;
-		Resources &res;
-
 	public:
-		typedef Resources Collection;
-
 		Loader(Style &, Resources &);
-		Style &get_object() const { return style; }
-		Resources &get_collection() const { return res; }
+
 	private:
 		void font(const std::string &);
-		void font_color(float, float, float);
-		void part();
+		void font_color_normal(float, float, float);
+		void font_color(State, float, float, float);
 		void part(const std::string &);
+		void unnamed_part();
 	};
 
 	typedef std::list<Part> PartSeq;
@@ -42,14 +36,14 @@ public:
 private:
 	const GL::Font *font;
 	unsigned font_size;
-	GL::Color font_color;
+	GL::Color font_color[N_STATES_];
 	PartSeq parts;
 
 public:
-	Style(Resources &);
-	const GL::Font &get_font() const  { return *font; }
+	Style();
+	const GL::Font &get_font() const;
 	unsigned get_font_size() const { return font_size; }
-	const GL::Color &get_font_color() const { return font_color; }
+	const GL::Color &get_font_color(State) const;
 	const PartSeq &get_parts() const { return parts; }
 	const Part *get_part(const std::string &) const;
 };