Refactor filling from Part to Alignment

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

diff --git a/source/part.cpp b/source/part.cpp
index a92e7208ca6883015cd978eb5c9218700538faec..ec36de9774aba7def07af052677af8d843be2568 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -16,9 +16,7 @@ namespace Msp {
 namespace GLtk {
 
 Part::Part(const string &n):
-       name(n),
-       fill_x(true),
-       fill_y(true)
+       name(n)
 {
        for(unsigned i=0; i<N_STATES_; ++i)
                graphic[i]=0;
@@ -38,10 +36,6 @@ void Part::render(const Geometry &parent, State state) const
                return;
 
        Geometry rgeom=geom;
-       if(fill_x)
-               rgeom.w=parent.w-margin.left-margin.right;
-       if(fill_y)
-               rgeom.h=parent.h-margin.bottom-margin.top;
        align.apply(rgeom, parent, margin);
        GL::translate(rgeom.x, rgeom.y, 0);
        graphic[state]->render(rgeom.w, rgeom.h);
@@ -84,10 +78,10 @@ void Part::Loader::align(float x, float y)
        part.align.y=y;
 }
 
-void Part::Loader::fill(bool x, bool y)
+void Part::Loader::fill(float w, float h)
 {
-       part.fill_x=x;
-       part.fill_y=y;
+       part.align.w=w;
+       part.align.h=h;
 }
 
 void Part::Loader::margin()