X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flist.h;h=060fb813f405cc9b29fb762c8a5ac93e7feedc61;hb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;hp=5b43661668d49ffdabe72f99ccd6d8d906395b7b;hpb=3e5232d9bd88e95f06db958bdcac4eaf738a8223;p=libs%2Fgltk.git diff --git a/source/list.h b/source/list.h index 5b43661..060fb81 100644 --- a/source/list.h +++ b/source/list.h @@ -7,7 +7,8 @@ #include "container.h" #include "label.h" #include "listdata.h" -#include "vslider.h" +#include "mspgltk_api.h" +#include "slider.h" namespace Msp { namespace GLtk { @@ -15,11 +16,10 @@ namespace GLtk { /** Thrown if a list's item type is incompatible with its data. */ -class incompatible_data: public std::logic_error +class MSPGLTK_API incompatible_data: public std::logic_error { public: incompatible_data(const std::type_info &); - virtual ~incompatible_data() throw() { } }; @@ -27,9 +27,15 @@ public: Shows a list of items, allowing the user to select one. A slider is included to allow scrolling through a long list. */ -class List: virtual public Widget, private Container +class MSPGLTK_API List: virtual public Widget, private Container { public: + enum ViewMode + { + LIST, + GRID + }; + class Loader: public DataFile::DerivedObjectLoader { public: @@ -55,48 +61,57 @@ private: }; public: - class Item: public Container + class Item: virtual public Widget, protected Container { + protected: + Item(); + public: - virtual const char *get_class() const { return "listitem"; } + const char *get_class() const override { return "listitem"; } protected: - virtual void autosize_special(const Part &, Geometry &) const; + void autosize_special(const Part &, Geometry &) const override; public: void set_active(bool); - virtual void render_special(const Part &, GL::Renderer &) const; + void render_special(const Part &, GL::Renderer &) const override; + }; + + class SimpleItem: public Item + { + protected: + SimpleItem() = default; + + void on_style_change() override; }; class MultiColumnItem: public Item { protected: + MultiColumnItem() = default; + virtual void check_widths(std::vector &) const; virtual void set_widths(const std::vector &); - private: - virtual void on_style_change(); + void on_style_change() override; }; 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 { protected: - ItemFactory() { } + ItemFactory() = default; public: - virtual ~ItemFactory() { } + virtual ~ItemFactory() = default; virtual void set_data(const ListData &) = 0; virtual Item *create_item(unsigned) const = 0; @@ -114,7 +129,7 @@ private: TypedItemFactory(const ListData &d) { set_data(d); } - virtual void set_data(const ListData &d) + void set_data(const ListData &d) override { if(const ListDataStore *ds = dynamic_cast *>(&d)) data = ds; @@ -122,40 +137,55 @@ private: throw incompatible_data(typeid(ValueType)); } - virtual Item *create_item(unsigned i) const + Item *create_item(unsigned i) const override { return new I(data->get(i)); } }; + struct Row + { + unsigned first; + unsigned height; + + Row(unsigned f): first(f), height(0) { } + }; + public: sigc::signal signal_item_selected; + sigc::signal signal_selection_cleared; private: - ListData *data; - bool own_data; - DataObserver *observer; - ItemFactory *item_factory; - int sel_index; - unsigned first; - unsigned max_scroll; - unsigned view_size; + ListData *data = nullptr; + bool own_data = false; + DataObserver *observer = nullptr; + ItemFactory *item_factory = nullptr; + ViewMode view_mode = LIST; + int sel_index = -1; + int focus_index = -1; + unsigned first_row = 0; + unsigned max_scroll = 0; + unsigned view_rows = 5; + unsigned view_columns = 5; + const Part *items_part = nullptr; + bool ignore_slider_change = false; + bool dragging = false; + int drag_start_x = 0; + int drag_start_y = 0; VSlider slider; std::vector items; + std::vector rows; public: List(); List(ListData &); -private: - void init(); -public: virtual ~List(); - virtual const char *get_class() const { return "list"; } + const char *get_class() const override { return "list"; } private: - virtual void autosize_special(const Part &, Geometry &) const; + void autosize_special(const Part &, Geometry &) const override; public: void set_data(ListData &); @@ -176,25 +206,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: - virtual void rebuild_special(const Part &); - virtual void render_special(const Part &, GL::Renderer &) const; + void set_selected_item(Widget *); -public: - virtual void button_press(int, int, unsigned); + void rebuild_special(const Part &) override; + void render_special(const Part &, GL::Renderer &) const override; +public: + bool key_press(unsigned, unsigned) override; + void button_press(int, int, unsigned) override; + void touch_press(int, int, unsigned) override; + void touch_release(int, int, unsigned) override; + void touch_motion(int, int, unsigned) override; + void focus_in() override; + bool navigate(Navigation) override; private: + void on_style_change() override; + + 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); }; +MSPGLTK_API void operator>>(const LexicalConverter &, List::ViewMode &); + } // namespace GLtk } // namespace Msp