X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.h;h=5fe07a4f07d17aa96e121c4eeec1cbabb76b035d;hb=4f4a17099ee8e927b55fb80c7eaf18a0b4b595db;hp=58386ca8f611560ad5fa21ba9cf28b8259dea365;hpb=d7ae291415a21cc886fe318070b41ac8d3e57a30;p=libs%2Fgltk.git

diff --git a/source/part.h b/source/part.h
index 58386ca..5fe07a4 100644
--- a/source/part.h
+++ b/source/part.h
@@ -1,10 +1,16 @@
+/* $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"
 
 namespace Msp {
@@ -13,43 +19,41 @@ namespace GLtk {
 class Graphic;
 class Resources;
 
+/**
+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_];
+	Geometry geom;
+	Sides margin;
+	Alignment align;
+
+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;
-private:
-	std::string name;
-	const Graphic *graphic[N_STATES_];
-	unsigned width;
-	unsigned height;
-	Alignment align;
-	bool fill_x;
-	bool fill_y;
 };
-typedef std::list<Part> PartSeq;
 
 } // namespace GLtk
 } // namespace Msp