X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.h;h=252d5a3cbecad1d2fafe1eec17edbced1a592fdf;hb=601e9fbcfdb26b53aff4d44805bb596f0b73208a;hp=a94f29db87421d5fdff157cbae4462f89884f1d6;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/part.h b/source/part.h
index a94f29d..252d5a3 100644
--- a/source/part.h
+++ b/source/part.h
@@ -1,17 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_PART_H_
 #define MSP_GLTK_PART_H_
 
-#include <map>
 #include <string>
-#include <msp/datafile/loader.h>
-//#include "alignment.h"
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 #include "state.h"
 
@@ -19,6 +10,7 @@ namespace Msp {
 namespace GLtk {
 
 class Graphic;
+class PartCache;
 class Resources;
 
 /**
@@ -27,20 +19,18 @@ Defines a single graphical element of a widget style.
 class Part
 {
 public:
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<Part>
 	{
-	private:
-		Part &part;
-		Resources &res;
-
 	public:
 		Loader(Part &, Resources &);
 		~Loader();
 	private:
+		void graphic_normal(const std::string &);
 		void graphic(State, const std::string &);
 		void align(float, float);
-		void fill(bool, bool);
+		void fill(float, float);
 		void margin();
+		void size(unsigned, unsigned);
 	};
 
 private:
@@ -49,8 +39,6 @@ private:
 	Geometry geom;
 	Sides margin;
 	Alignment align;
-	bool fill_x;
-	bool fill_y;
 
 public:
 	Part(const std::string &);
@@ -59,11 +47,8 @@ public:
 	const Geometry &get_geometry() const { return geom; }
 	const Sides &get_margin() const { return margin; }
 	const Alignment &get_alignment() const { return align; }
-	bool get_fill_x() const { return fill_x; }
-	bool get_fill_y() const { return fill_y; }
-	void render(const Geometry &, State) const;
+	void build(const Geometry &, State, PartCache &) const;
 };
-typedef std::list<Part> PartSeq;
 
 } // namespace GLtk
 } // namespace Msp