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

diff --git a/source/part.h b/source/part.h
index 5736f7a..edc524c 100644
--- a/source/part.h
+++ b/source/part.h
@@ -11,7 +11,8 @@ Distributed under the LGPL
 #include <map>
 #include <string>
 #include <msp/datafile/loader.h>
-#include "alignment.h"
+//#include "alignment.h"
+#include "geometry.h"
 #include "state.h"
 
 namespace Msp {
@@ -37,28 +38,26 @@ public:
 		~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;