Refactor filling from Part to Alignment

[libs/gltk.git] / source / part.h

diff --git a/source/part.h b/source/part.h
index 5736f7a476d9a5d72b3ded4c040138b38ef0888c..edc8f77a5b84230d883d277f5bf29c2e77fe6ef9 100644 (file)
--- 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,25 @@ 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();
        };
 
 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;