X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.h;h=5fe07a4f07d17aa96e121c4eeec1cbabb76b035d;hb=033732b500a35f3737bad515349d884cb3f123f0;hp=5736f7a476d9a5d72b3ded4c040138b38ef0888c;hpb=c2635c5a3dca6a6cea5562fd387beb0662b18cf0;p=libs%2Fgltk.git

diff --git a/source/part.h b/source/part.h
index 5736f7a..5fe07a4 100644
--- a/source/part.h
+++ b/source/part.h
@@ -8,10 +8,9 @@ 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"
 
 namespace Msp {
@@ -26,42 +25,35 @@ 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(State, const std::string &);
-		void align(int, int);
-		void fill(bool, bool);
+		void align(float, float);
+		void fill(float, float);
+		void margin();
+		void size(unsigned, unsigned);
 	};
 
 private:
 	std::string name;
 	const Graphic *graphic[N_STATES_];
-	unsigned width;
-	unsigned height;
+	Geometry geom;
+	Sides margin;
 	Alignment align;
-	bool fill_x;
-	bool fill_y;
 
 public:
 	Part(const std::string &);
 	const std::string &get_name() const { return name; }
 	const Graphic *get_graphic(State) const;
-	unsigned get_width() const { return width; }
-	unsigned get_height() const { return height; }
+	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;
 };
-typedef std::list<Part> PartSeq;
 
 } // namespace GLtk
 } // namespace Msp