Reorder class members

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

diff --git a/source/part.cpp b/source/part.cpp
index 38e75d7c034d4526f08662ec732deb7d8493f83d..f5e4b79ef5c36a674f329fd9ca3dbc9a575c5e1c 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include "geometry.h"
 #include "part.h"
 #include "resources.h"
@@ -7,9 +14,10 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Part::Part(const Resources &r, const string &n):
-       res(r),
+Part::Part(const string &n):
        name(n),
+       width(1),
+       height(1),
        fill_x(true),
        fill_y(true)
 {
@@ -27,33 +35,42 @@ const Graphic *Part::get_graphic(State state) const
 
 void Part::render(const Geometry &geom, State state) const
 {
-       const Graphic::Sides &shadow=graphic[state]->get_shadow();
-       unsigned gw=(fill_x ? geom.w : graphic[state]->get_width())-shadow.left-shadow.right;
-       unsigned gh=(fill_y ? geom.h : graphic[state]->get_height())-shadow.top-shadow.bottom;
+       unsigned gw=(fill_x ? geom.w : width);
+       unsigned gh=(fill_y ? geom.h : height);
        align.apply(geom, gw, gh);
        graphic[state]->render(gw, gh);
 }
 
 
-Part::Loader::Loader(Part &p):
-       part(p)
+Part::Loader::Loader(Part &p, Resources &r):
+       part(p),
+       res(r)
 {
        add("graphic", &Loader::graphic);
        add("align",   &Loader::align);
        add("fill",    &Loader::fill);
 }
 
-void Part::Loader::graphic(State s, const string &n)
+Part::Loader::~Loader()
 {
-       part.graphic[s]=&part.res.get_graphic(n);
-       if(s==NORMAL)
+       for(unsigned i=0; i<N_STATES_; ++i)
        {
-               for(unsigned i=0; i<N_STATES_; ++i)
-                       if(!part.graphic[i])
-                               part.graphic[i]=part.graphic[s];
+               if(part.graphic[i])
+               {
+                       const Sides &shadow=part.graphic[i]->get_shadow();
+                       part.width=max(part.width, part.graphic[i]->get_width()-shadow.left-shadow.right);
+                       part.height=max(part.height, 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);
+}
+
 void Part::Loader::align(int x, int y)
 {
        part.align.x=x;