From 26693191362f75438afbb3bd871fd4c8b9306762 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 30 Aug 2011 13:40:44 +0000
Subject: [PATCH] Better support for flat lists in wxTreeListCtrl.

Override wxDataViewModel::IsListModel() to return true if wxTreeListCtrl
doesn't have any depth. This results in better display when using the generic
implementation of wxDataViewCtrl as no space is reserved for the (unnecessary)
expanders in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/treelist/treelist.cpp | 19 ++++++++++++++++++-
 src/generic/treelist.cpp      | 13 +++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp
index 4ee77cc..1389452 100644
--- a/samples/treelist/treelist.cpp
+++ b/samples/treelist/treelist.cpp
@@ -56,6 +56,7 @@
 enum
 {
     Id_MultiSelect = 100,
+    Id_FlatList,
 
     Id_Checkboxes_Start,
     Id_NoCheckboxes = Id_Checkboxes_Start,
@@ -94,6 +95,7 @@ public:
 private:
     // Event handlers for the menu and wxTreeListCtrl events.
     void OnMultiSelect(wxCommandEvent& event);
+    void OnFlatList(wxCommandEvent& event);
     void OnCheckboxes(wxCommandEvent& event);
     void OnDumpSelection(wxCommandEvent& event);
     void OnCheckHTMLDocs(wxCommandEvent& event);
@@ -142,6 +144,8 @@ private:
 
     wxLog* m_oldLogTarget;
 
+    bool m_isFlat;
+
     wxDECLARE_EVENT_TABLE();
 };
 
@@ -171,6 +175,7 @@ bool MyApp::OnInit()
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Id_MultiSelect, MyFrame::OnMultiSelect)
+    EVT_MENU(Id_FlatList, MyFrame::OnFlatList)
     EVT_MENU_RANGE(Id_Checkboxes_Start, Id_Checkboxes_End,
                    MyFrame::OnCheckboxes)
 
@@ -194,6 +199,8 @@ MyFrame::MyFrame()
        : wxFrame(NULL, wxID_ANY, "wxWidgets tree/list control sample",
                  wxDefaultPosition, wxSize(600, 450))
 {
+    m_isFlat = false;
+
     // Create menus and status bar.
     SetIcon(wxICON(sample));
 
@@ -211,6 +218,8 @@ MyFrame::MyFrame()
                                "&3-state checkboxes\tCtrl-3");
     treeStyle->AppendRadioItem(Id_CheckboxesUser3State,
                                "&User-settable 3-state checkboxes\tCtrl-4");
+    treeStyle->AppendSeparator();
+    treeStyle->AppendCheckItem(Id_FlatList, "&Flat list");
 
     wxMenu* treeOper = new wxMenu;
     treeOper->Append(Id_DumpSelection, "&Dump selection\tCtrl-D");
@@ -312,7 +321,8 @@ wxTreeListCtrl* MyFrame::CreateTreeListCtrl(long style)
 
     // Define a shortcut to save on typing here.
     #define ADD_ITEM(item, parent, files, size) \
-        wxTreeListItem item = tree->AppendItem(parent, #item, \
+        wxTreeListItem item = tree->AppendItem(m_isFlat ? root : parent, \
+                                               #item, \
                                                Icon_FolderClosed, \
                                                Icon_FolderOpened); \
         tree->SetItemText(item, Col_Files, files); \
@@ -367,6 +377,13 @@ void MyFrame::OnMultiSelect(wxCommandEvent& event)
     RecreateTreeListCtrl(style);
 }
 
+void MyFrame::OnFlatList(wxCommandEvent& event)
+{
+    m_isFlat = event.IsChecked();
+
+    RecreateTreeListCtrl(m_treelist->GetWindowStyle());
+}
+
 void MyFrame::OnCheckboxes(wxCommandEvent& event)
 {
     long style = m_treelist->GetWindowStyle();
diff --git a/src/generic/treelist.cpp b/src/generic/treelist.cpp
index 21a4905..123a498 100644
--- a/src/generic/treelist.cpp
+++ b/src/generic/treelist.cpp
@@ -342,6 +342,7 @@ public:
     virtual bool HasContainerColumns(const wxDataViewItem& item) const;
     virtual unsigned GetChildren(const wxDataViewItem& item,
                                  wxDataViewItemArray& children) const;
+    virtual bool IsListModel() const { return m_isFlat; }
 
 private:
     // The control we're associated with.
@@ -352,6 +353,11 @@ private:
 
     // Number of columns we maintain.
     unsigned m_numColumns;
+
+    // Set to false as soon as we have more than one level, i.e. as soon as any
+    // items with non-root item as parent are added (and currently never reset
+    // after this).
+    bool m_isFlat;
 };
 
 // ============================================================================
@@ -554,6 +560,7 @@ wxTreeListModel::wxTreeListModel(wxTreeListCtrl* treelist)
       m_root(new Node(NULL))
 {
     m_numColumns = 0;
+    m_isFlat = true;
 }
 
 wxTreeListModel::~wxTreeListModel()
@@ -590,6 +597,12 @@ wxTreeListModel::InsertItem(Node* parent,
     wxCHECK_MSG( previous, NULL,
                  "Must have a valid previous item (maybe wxTLI_FIRST/LAST?)" );
 
+    if ( m_isFlat && parent != m_root )
+    {
+        // Not flat any more, this is a second level child.
+        m_isFlat = false;
+    }
+
     wxScopedPtr<Node>
         newItem(new Node(parent, text, imageClosed, imageOpened, data));
 
-- 
2.7.4