Change State into a bitmask to allow more fine-grained control of styles

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

diff --git a/source/part.cpp b/source/part.cpp
index a74c91141ca717c86262c8a634f8db75ff359226..1f58b6187d679c983ad044310b20b5b739e1a6c5 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -56,21 +56,20 @@ 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);
                }
-               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)