Mark List::Item as receiving navigation input

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

diff --git a/source/list.h b/source/list.h
index ef4311e0702c73b818a19ab3abaadb07e1427abb..8b9db4090ecfa7ef9b6ece56ef291366f75313f6 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -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();
        };
 
@@ -148,11 +160,13 @@ private:
        bool own_data;
        DataObserver *observer;
        ItemFactory *item_factory;
+       ViewMode view_mode;
        int sel_index;
        int focus_index;
        unsigned first_row;
        unsigned max_scroll;
        unsigned view_rows;
+       unsigned view_columns;
        const Part *items_part;
        bool ignore_slider_change;
        bool dragging;
@@ -195,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);
@@ -230,6 +246,8 @@ private:
        static void adjust_index(int &, int, int);
 };
 
+void operator>>(const LexicalConverter &, List::ViewMode &);
+
 } // namespace GLtk
 } // namespace Msp