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 25001d18f7948dcab5af79e8671feddf538a61ae..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"; }
 
@@ -70,17 +79,20 @@ public:
 
        class SimpleItem: public Item
        {
-       private:
+       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();
        };
 
@@ -131,6 +143,14 @@ 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;
@@ -140,11 +160,14 @@ private:
        bool own_data;
        DataObserver *observer;
        ItemFactory *item_factory;
+       ViewMode view_mode;
        int sel_index;
        int focus_index;
-       unsigned first;
+       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;
@@ -152,6 +175,7 @@ private:
 
        VSlider slider;
        std::vector<Item *> items;
+       std::vector<Row> rows;
 
 public:
        List();
@@ -185,7 +209,9 @@ 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);
@@ -205,17 +231,23 @@ public:
        virtual void focus_in();
        virtual bool navigate(Navigation);
 private:
+       virtual void on_style_change();
+
        void move_focus(Navigation, bool);
        void set_focus_index(int);
 
        void item_autosize_changed(Item *);
-       unsigned last_to_first(unsigned) const;
+       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