X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=8a3e3a9958c1a3a86c9b0ba08c1316d7458999bb;hb=56c41b294aa47a38ac3e1be70d4868f260cb4274;hp=29c5e3430b0fca7a1581312fee3e1a2df5ac999f;hpb=11d1b67a9180a0e468b56e355fbe0c88d104ef72;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index 29c5e34..8a3e3a9 100644
--- a/source/style.h
+++ b/source/style.h
@@ -3,7 +3,9 @@
 
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
-#include <msp/datafile/loader.h>
+#include <msp/gl/sampler.h>
+#include <msp/datafile/objectloader.h>
+#include "mspgltk_api.h"
 #include "part.h"
 
 namespace Msp {
@@ -15,26 +17,20 @@ class Resources;
 Styles define what wigets look like.  They are made up of Parts and some
 generic properties.
 */
-class Style
+class MSPGLTK_API 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,16 +38,19 @@ public:
 private:
 	const GL::Font *font;
 	unsigned font_size;
-	GL::Color font_color;
+	GL::Color font_color[N_STATES_];
+	const GL::Sampler *sampler;
 	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 GL::Sampler &get_sampler() const;
 	const PartSeq &get_parts() const { return parts; }
 	const Part *get_part(const std::string &) const;
+	bool compare_states(State, State) const;
 };
 
 } // namespace GLtk