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

diff --git a/source/style.h b/source/style.h
index a757abc..3025514 100644
--- a/source/style.h
+++ b/source/style.h
@@ -1,9 +1,9 @@
 #ifndef MSP_GLTK_STYLE_H_
 #define MSP_GLTK_STYLE_H_
 
+#include <msp/gl/color.h>
 #include <msp/gl/font.h>
-#include <msp/parser/loader.h>
-#include "color.h"
+#include <msp/datafile/objectloader.h>
 #include "part.h"
 
 namespace Msp {
@@ -11,32 +11,41 @@ namespace GLtk {
 
 class Resources;
 
+/**
+Styles define what wigets look like.  They are made up of Parts and some
+generic properties.
+*/
 class Style
 {
 public:
-	class Loader: public Parser::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Style, Resources>
 	{
 	public:
-		Loader(Style &);
-	private:
-		Style &style;
+		Loader(Style &, Resources &);
 
+	private:
 		void font(const std::string &);
-		void font_color(float, float, float);
+		void font_color_normal(float, float, float);
+		void font_color(State, float, float, float);
 		void part(const std::string &);
+		void unnamed_part();
 	};
 
-	Style(const Resources &, const std::string &, const std::string &);
-	const GL::Font *get_font() const  { return font; }
-	const Color    &get_font_color() const { return font_color; }
-	const PartSeq  &get_parts() const { return parts; }
+	typedef std::list<Part> PartSeq;
+
 private:
-	const Resources &res;
-	std::string widget;
-	std::string name;
 	const GL::Font *font;
-	Color font_color;
-	PartSeq  parts;
+	unsigned font_size;
+	GL::Color font_color[N_STATES_];
+	PartSeq parts;
+
+public:
+	Style();
+	const GL::Font &get_font() const;
+	unsigned get_font_size() const { return font_size; }
+	const GL::Color &get_font_color(State) const;
+	const PartSeq &get_parts() const { return parts; }
+	const Part *get_part(const std::string &) const;
 };
 
 } // namespace GLtk