From f58cd169c08a4be9ae07903a9e61b686bb7a75b6 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Sun, 22 Apr 2012 13:40:02 +0000 Subject: Various mods for Fl_Tree o Fix STR#2828 (E): {Vertical|Widget} Gap o Moved Fabien's reselected methods to Fl_Tree_Prefs, return method made const, doxygen, removed underbars from methods (to follow general API) o Widgets can now appear to the right of labels. This can be controlled with item_draw_mode(FL_TREE_ITEM_DRAW_LABEL_AND_WIDGET) o Cleaned up Fl_Tree_Item::draw(), Fl_Tree::draw() o New methods: marginbottom() -- [ABI feature] extra space below last tree element when scrolling widgetmarginleft() -- [ABI feature] space to left of widget usericonmarginleft() -- space to left of usericon labelmarginleft() -- space to left of label item_draw_mode() -- control how items, widget() are drawn o Updated Fl_Tree docs, tree-elements.png o test/tree: added sliders to test the above new features, added "open all" and "close all" buttons o Probably other stuff.. TODO: Fix "scroll-beyond-bottom" (STR#2796) TODO: Fix other items in STR#2828 git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9377 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Tree.H | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) (limited to 'FL/Fl_Tree.H') diff --git a/FL/Fl_Tree.H b/FL/Fl_Tree.H index aa43fd2a1..1b8dbd758 100644 --- a/FL/Fl_Tree.H +++ b/FL/Fl_Tree.H @@ -194,17 +194,6 @@ enum Fl_Tree_Reason { FL_TREE_REASON_CLOSED ///< an item was closed }; -#if FLTK_ABI_VERSION >= 10302 -/// \enum Fl_Tree_Item_Select_Mode -/// Defines the ways an item can be (re) selected. -/// -enum Fl_Tree_Item_Reselect_Mode -{ - FL_TREE_SELECTABLE_ONCE=0, /// backward compatible default: an item can only be selected once - FL_TREE_SELECTABLE_ALWAYS, /// needed for new RESELECT feature -}; -#endif - class FL_EXPORT Fl_Tree : public Fl_Group { Fl_Tree_Item *_root; // can be null! Fl_Tree_Item *_item_focus; // item that has focus box @@ -216,20 +205,6 @@ class FL_EXPORT Fl_Tree : public Fl_Group { #if FLTK_ABI_VERSION >= 10302 // NEW: Fl_Tree_Item *_lastselect; - - // NEW: -public: - //! Returns the current item re/selection mode - Fl_Tree_Item_Reselect_Mode item_reselect_mode() const { - return _itemReselectMode; - } - - //! Sets the item re/selection mode - void item_reselect_mode(Fl_Tree_Item_Reselect_Mode mode) { - _itemReselectMode = mode; - } -private: - Fl_Tree_Item_Reselect_Mode _itemReselectMode; #else // OLD: static data inside handle() method #endif @@ -325,8 +300,20 @@ public: void marginleft(int val); int margintop() const; void margintop(int val); +#if FLTK_ABI_VERSION >= 10302 + int marginbottom() const; + void marginbottom(int val); +#endif + int linespacing() const; + void linespacing(int val); int openchild_marginbottom() const; void openchild_marginbottom(int val); + int usericonmarginleft() const; + void usericonmarginleft(int val); + int labelmarginleft() const; + void labelmarginleft(int val); + int widgetmarginleft() const; + void widgetmarginleft(int val); int connectorwidth() const; void connectorwidth(int val); Fl_Image* usericon() const; @@ -347,6 +334,12 @@ public: void selectbox(Fl_Boxtype val); Fl_Tree_Select selectmode() const; void selectmode(Fl_Tree_Select val); +#if FLTK_ABI_VERSION >= 10302 + Fl_Tree_Item_Reselect_Mode item_reselect_mode() const; + void item_reselect_mode(Fl_Tree_Item_Reselect_Mode mode); + Fl_Tree_Item_Draw_Mode item_draw_mode() const; + void item_draw_mode(Fl_Tree_Item_Draw_Mode mode); +#endif int displayed(Fl_Tree_Item *item); void show_item(Fl_Tree_Item *item, int yoff); -- cgit v1.2.3