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

diff --git a/source/part.h b/source/part.h
index 29085c2..edc524c 100644
--- a/source/part.h
+++ b/source/part.h
@@ -1,10 +1,18 @@
+/* $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 "alignment.h"
+#include "geometry.h"
 #include "state.h"
 
 namespace Msp {
@@ -13,40 +21,44 @@ namespace GLtk {
 class Graphic;
 class Resources;
 
+/**
+Defines a single graphical element of a widget style.
+*/
 class Part
 {
 public:
 	class Loader: public DataFile::Loader
 	{
-	public:
-		Loader(Part &);
-		~Loader();
 	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);
 	};
 
-	Part(const Resources &, 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 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:
-	const Resources &res;
 	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;
+	const Geometry &get_geometry() const { return geom; }
+	const Sides &get_margin() const { return margin; }
+	const Alignment &get_alignment() const { return align; }
+	void render(const Geometry &, State) const;
 };
 typedef std::list<Part> PartSeq;