Implement mouse wheel scrolling in List

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

diff --git a/source/graphic.h b/source/graphic.h
index b93111348175874150190c1666c5d6896d6efe61..1ae0d5e22d8766a718bbd828329be7bb334663dd 100644 (file)
--- a/source/graphic.h
+++ b/source/graphic.h
@@ -1,8 +1,9 @@
 #ifndef MSP_GLTK_GRAPHIC_H_
 #define MSP_GLTK_GRAPHIC_H_
 
+#include <msp/gl/primitivebuilder.h>
 #include <msp/gl/texture2d.h>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "geometry.h"
 
 namespace Msp {
@@ -10,20 +11,17 @@ namespace GLtk {
 
 class Resources;
 
+/**
+Stores a single graphical element.  Graphics are used as parts of widgets.
+*/
 class Graphic
 {
 public:
-       class Loader: public DataFile::Loader
+       class Loader: public DataFile::CollectionObjectLoader<Graphic, Resources>
        {
-       private:
-               Graphic &graph;
-               Resources &res;
-
        public:
-               typedef Resources Collection;
-
                Loader(Graphic &, Resources &);
-               Graphic &get_object() const { return graph; }
+
        private:
                void texture(const std::string &);
                void slice(unsigned, unsigned, unsigned, unsigned);
@@ -31,13 +29,6 @@ public:
                void shadow();
        };
 
-       Graphic();
-       const Sides &get_border() const { return border; }
-       const Sides &get_shadow() const { return shadow; }
-       const GL::Texture2D *get_texture() const { return texture; }
-       unsigned get_width() const  { return slice.w; }
-       unsigned get_height() const { return slice.h; }
-       void render(unsigned, unsigned) const;
 private:
        Sides border;
        Sides shadow;
@@ -45,6 +36,15 @@ private:
        Geometry slice;
        bool repeat;
 
+public:
+       Graphic();
+       const Sides &get_border() const { return border; }
+       const Sides &get_shadow() const { return shadow; }
+       const GL::Texture2D *get_texture() const { return texture; }
+       unsigned get_width() const  { return slice.w; }
+       unsigned get_height() const { return slice.h; }
+       void build(unsigned, unsigned, GL::PrimitiveBuilder &) const;
+private:
        void create_coords(float, float, float, float, float, std::vector<float> &) const;
        void create_texcoords(float, float, float, float, float, std::vector<float> &) const;
 };