X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpart.cpp;h=1f58b6187d679c983ad044310b20b5b739e1a6c5;hb=3f301f9b6f73e886bdbb61565edb2c02667039d0;hp=ec36de9774aba7def07af052677af8d843be2568;hpb=8f6f543758fb1b2b17ae2db519198d420eb9982d;p=libs%2Fgltk.git

diff --git a/source/part.cpp b/source/part.cpp
index ec36de9..1f58b61 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -50,26 +50,26 @@ Part::Loader::Loader(Part &p, Resources &r):
 	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])
 		{
 			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)
@@ -89,5 +89,11 @@ void Part::Loader::margin()
 	load_sub(part.margin);
 }
 
+void Part::Loader::size(unsigned w, unsigned h)
+{
+	part.geom.w=w;
+	part.geom.h=h;
+}
+
 } // namespace GLtk
 } // namespace Msp