X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fpart.cpp;h=b75e98ff7491cddca368cfc0061cf0ee8774fe2a;hb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;hp=a74c91141ca717c86262c8a634f8db75ff359226;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index a74c911..b75e98f 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -19,7 +19,7 @@ Part::Part(const string &n):
 	name(n)
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
-		graphic[i]=0;
+		graphic[i] = 0;
 }
 
 const Graphic *Part::get_graphic(State state) const
@@ -35,7 +35,7 @@ void Part::render(const Geometry &parent, State state) const
 	if(!graphic[state])
 		return;
 
-	Geometry rgeom=geom;
+	Geometry rgeom = geom;
 	align.apply(rgeom, parent, margin);
 	GL::translate(rgeom.x, rgeom.y, 0);
 	graphic[state]->render(rgeom.w, rgeom.h);
@@ -56,33 +56,32 @@ Part::Loader::Loader(Part &p, Resources &r):
 Part::Loader::~Loader()
 {
 	for(unsigned i=0; i<N_STATES_; ++i)
-	{
 		if(part.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 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);
 		}
-		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 = res.get<Graphic>(n);
+	for(int i=0; i<N_STATES_; ++i)
+		if((i&s)==s)
+			part.graphic[i] = grph;
 }
 
 void Part::Loader::align(float x, float y)
 {
-	part.align.x=x;
-	part.align.y=y;
+	part.align.x = x;
+	part.align.y = y;
 }
 
 void Part::Loader::fill(float w, float h)
 {
-	part.align.w=w;
-	part.align.h=h;
+	part.align.w = w;
+	part.align.h = h;
 }
 
 void Part::Loader::margin()
@@ -92,8 +91,8 @@ void Part::Loader::margin()
 
 void Part::Loader::size(unsigned w, unsigned h)
 {
-	part.geom.w=w;
-	part.geom.h=h;
+	part.geom.w = w;
+	part.geom.h = h;
 }
 
 } // namespace GLtk