Refactor all slider logic into the Slider class

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

diff --git a/source/list.h b/source/list.h
index 9805176f188da400610f35d17b68546ed6cd27ff..19fdaa5df6f4592f2682b0c80982e62a8c697d62 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -7,7 +7,7 @@
 #include "container.h"
 #include "label.h"
 #include "listdata.h"
-#include "vslider.h"
+#include "slider.h"
 
 namespace Msp {
 namespace GLtk {
@@ -30,6 +30,12 @@ to allow scrolling through a long list.
 class List: virtual public Widget, private Container
 {
 public:
+       enum ViewMode
+       {
+               LIST,
+               GRID
+       };
+
        class Loader: public DataFile::DerivedObjectLoader<List, Widget::Loader>
        {
        public:
@@ -55,8 +61,11 @@ private:
        };
 
 public:
-       class Item: public Container
+       class Item: virtual public Widget, protected Container
        {
+       protected:
+               Item();
+
        public:
                virtual const char *get_class() const { return "listitem"; }
 
@@ -68,27 +77,33 @@ public:
                virtual void render_special(const Part &, GL::Renderer &) const;
        };
 
+       class SimpleItem: public Item
+       {
+       protected:
+               SimpleItem() { }
+
+               virtual void on_style_change();
+       };
+
        class MultiColumnItem: public Item
        {
        protected:
+               MultiColumnItem() { }
+
                virtual void check_widths(std::vector<unsigned> &) const;
                virtual void set_widths(const std::vector<unsigned> &);
 
-       private:
                virtual void on_style_change();
        };
 
 private:
-       class BasicItem: public Item
+       class BasicItem: public SimpleItem
        {
        private:
                Label label;
 
        public:
                BasicItem(const std::string &);
-
-       private:
-               virtual void on_style_change();
        };
 
        class ItemFactory
@@ -128,21 +143,39 @@ private:
                }
        };
 
+       struct Row
+       {
+               unsigned first;
+               unsigned height;
+
+               Row(unsigned f): first(f), height(0) { }
+       };
+
 public:
        sigc::signal<void, unsigned> signal_item_selected;
+       sigc::signal<void> signal_selection_cleared;
 
 private:
        ListData *data;
        bool own_data;
        DataObserver *observer;
        ItemFactory *item_factory;
+       ViewMode view_mode;
        int sel_index;
-       unsigned first;
+       int focus_index;
+       unsigned first_row;
        unsigned max_scroll;
-       unsigned view_size;
+       unsigned view_rows;
+       unsigned view_columns;
+       const Part *items_part;
+       bool ignore_slider_change;
+       bool dragging;
+       int drag_start_x;
+       int drag_start_y;
 
        VSlider slider;
        std::vector<Item *> items;
+       std::vector<Row> rows;
 
 public:
        List();
@@ -176,28 +209,45 @@ private:
        Item *create_item(unsigned);
 
 public:
+       void set_view_mode(ViewMode);
        void set_view_size(unsigned);
+       void set_view_size(unsigned, unsigned);
        void set_view_all();
 
        void set_selected_index(int);
        int get_selected_index() const { return sel_index; }
-
 private:
+       void set_selected_item(Widget *);
+
        virtual void rebuild_special(const Part &);
        virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
+       virtual bool key_press(unsigned, unsigned);
        virtual void button_press(int, int, unsigned);
+       virtual void touch_press(int, int, unsigned);
+       virtual void touch_release(int, int, unsigned);
+       virtual void touch_motion(int, int, unsigned);
+       virtual void focus_in();
+       virtual bool navigate(Navigation);
 private:
-       virtual void on_geometry_change();
        virtual void on_style_change();
 
-       void item_autosize_changed();
-       void reposition_items();
+       void move_focus(Navigation, bool);
+       void set_focus_index(int);
+
+       void item_autosize_changed(Item *);
+       void reposition_items(bool);
+       unsigned last_to_first_row(unsigned) const;
+       unsigned item_index_to_row(unsigned) const;
        void check_view_range();
+       void scroll_to_focus();
        void slider_value_changed(double);
+       static void adjust_index(int &, int, int);
 };
 
+void operator>>(const LexicalConverter &, List::ViewMode &);
+
 } // namespace GLtk
 } // namespace Msp