X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=f2797f9058ad66fe8633256c286eb3b794fe8cab;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=a92e7208ca6883015cd978eb5c9218700538faec;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index a92e720..f2797f9 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -16,12 +16,10 @@ 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;
+		graphic[i] = 0;
 }
 
 const Graphic *Part::get_graphic(State state) const
@@ -37,11 +35,7 @@ void Part::render(const Geometry &parent, State state) const
 	if(!graphic[state])
 		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;
+	Geometry rgeom = geom;
 	align.apply(rgeom, parent, margin);
 	GL::translate(rgeom.x, rgeom.y, 0);
 	graphic[state]->render(rgeom.w, rgeom.h);
@@ -49,50 +43,56 @@ void Part::render(const Geometry &parent, State state) const
 
 
 Part::Loader::Loader(Part &p, Resources &r):
-	part(p),
-	res(r)
+	DataFile::CollectionObjectLoader<Part>(p, &r)
 {
 	add("graphic", &Loader::graphic);
 	add("align",   &Loader::align);
 	add("fill",    &Loader::fill);
 	add("margin",  &Loader::margin);
+	add("size",    &Loader::size);
 }
 
 Part::Loader::~Loader()
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
-	{
-		if(part.graphic[i])
+		if(obj.graphic[i])
 		{
-			const Sides &shadow=part.graphic[i]->get_shadow();
-			part.geom.w=max(part.geom.w, part.graphic[i]->get_width()-shadow.left-shadow.right);
-			part.geom.h=max(part.geom.h, part.graphic[i]->get_height()-shadow.bottom-shadow.top);
+			const Graphic &grph = *obj.graphic[i];
+			const Sides &shadow = grph.get_shadow();
+			obj.geom.w = max(obj.geom.w, grph.get_width()-shadow.left-shadow.right);
+			obj.geom.h = max(obj.geom.h, grph.get_height()-shadow.bottom-shadow.top);
 		}
-		else
-			part.graphic[i]=part.graphic[NORMAL];
-	}
 }
 
 void Part::Loader::graphic(State s, const string &n)
 {
-	part.graphic[s]=res.get<Graphic>(n);
+	Graphic *grph = get_collection().get<Graphic>(n);
+	for(int i=0; i<N_STATES_; ++i)
+		if((i&s)==s)
+			obj.graphic[i] = grph;
 }
 
 void Part::Loader::align(float x, float y)
 {
-	part.align.x=x;
-	part.align.y=y;
+	obj.align.x = x;
+	obj.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;
+	obj.align.w = w;
+	obj.align.h = h;
 }
 
 void Part::Loader::margin()
 {
-	load_sub(part.margin);
+	load_sub(obj.margin);
+}
+
+void Part::Loader::size(unsigned w, unsigned h)
+{
+	obj.geom.w = w;
+	obj.geom.h = h;
 }
 
 } // namespace GLtk