Don't rebuild on state change if there are no visual changes

[libs/gltk.git] / source / style.h

diff --git a/source/style.h b/source/style.h
index 620aa21245bdf03f2ca0c788ffb9aa9c88dc2b67..ed1de87621e99cce33bd5dd2ee10b6ebdb6a0fa4 100644 (file)
--- a/source/style.h
+++ b/source/style.h
@@ -3,7 +3,7 @@
 
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "part.h"
 
 namespace Msp {
@@ -18,23 +18,17 @@ generic properties.
 class Style
 {
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::CollectionObjectLoader<Style, Resources>
        {
-       private:
-               Style &style;
-               Resources &res;
-
        public:
-               typedef Resources Collection;
-
                Loader(Style &, Resources &);
-               Style &get_object() const { return style; }
-               Resources &get_collection() const { return res; }
+
        private:
                void font(const std::string &);
-               void font_color(float, float, float);
-               void part();
+               void font_color_normal(float, float, float);
+               void font_color(State, float, float, float);
                void part(const std::string &);
+               void unnamed_part();
        };
 
        typedef std::list<Part> PartSeq;
@@ -42,16 +36,17 @@ public:
 private:
        const GL::Font *font;
        unsigned font_size;
-       GL::Color font_color;
+       GL::Color font_color[N_STATES_];
        PartSeq parts;
 
 public:
        Style();
        const GL::Font &get_font() const;
        unsigned get_font_size() const { return font_size; }
-       const GL::Color &get_font_color() const { return font_color; }
+       const GL::Color &get_font_color(State) const;
        const PartSeq &get_parts() const { return parts; }
        const Part *get_part(const std::string &) const;
+       bool compare_states(State, State) const;
 };
 
 } // namespace GLtk