[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 161/473: Only use tree models when necessary.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 33901483d7c7b71687df0578944fb41856539870
Author: Graeme Gott <graeme at gottcode.org>
Date:   Tue Aug 20 18:01:08 2013 -0400

    Only use tree models when necessary.
---
 src/category.cpp |   73 +++++++++++++++++++++++++++++++++++++++++++-----------
 src/category.hpp |    2 ++
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/src/category.cpp b/src/category.cpp
index 5e350d3..62517d1 100644
--- a/src/category.cpp
+++ b/src/category.cpp
@@ -40,7 +40,8 @@ static bool is_null(const Element* element)
 Category::Category(GarconMenuDirectory* directory) :
 	m_button(NULL),
 	m_model(NULL),
-	m_has_separators(false)
+	m_has_separators(false),
+	m_has_subcategories(false)
 {
 	// Fetch icon
 	const gchar* icon = garcon_menu_directory_get_icon_name(directory);
@@ -94,13 +95,26 @@ GtkTreeModel* Category::get_model()
 {
 	if (!m_model)
 	{
-		GtkTreeStore* model = gtk_tree_store_new(
-				LauncherModel::N_COLUMNS,
-				G_TYPE_STRING,
-				G_TYPE_STRING,
-				G_TYPE_POINTER);
-		insert_items(model, NULL, get_icon());
-		m_model = GTK_TREE_MODEL(model);
+		if (m_has_subcategories)
+		{
+			GtkTreeStore* model = gtk_tree_store_new(
+					LauncherModel::N_COLUMNS,
+					G_TYPE_STRING,
+					G_TYPE_STRING,
+					G_TYPE_POINTER);
+			insert_items(model, NULL, get_icon());
+			m_model = GTK_TREE_MODEL(model);
+		}
+		else
+		{
+			GtkListStore* model = gtk_list_store_new(
+					LauncherModel::N_COLUMNS,
+					G_TYPE_STRING,
+					G_TYPE_STRING,
+					G_TYPE_POINTER);
+			insert_items(model);
+			m_model = GTK_TREE_MODEL(model);
+		}
 	}
 
 	return m_model;
@@ -125,6 +139,7 @@ bool Category::empty() const
 
 Category* Category::append_menu(GarconMenuDirectory* directory)
 {
+	m_has_subcategories = true;
 	unset_model();
 	Category* category = new Category(directory);
 	m_items.push_back(category);
@@ -208,8 +223,42 @@ void Category::insert_items(GtkTreeStore* model, GtkTreeIter* parent, const gcha
 
 //-----------------------------------------------------------------------------
 
+void Category::insert_items(GtkListStore* model)
+{
+	for (std::vector<Element*>::size_type i = 0, end = m_items.size(); i < end; ++i)
+	{
+		Element* element = m_items.at(i);
+		if (element)
+		{
+			Launcher* launcher = static_cast<Launcher*>(element);
+			gtk_list_store_insert_with_values(model,
+					NULL, INT_MAX,
+					LauncherModel::COLUMN_ICON, launcher->get_icon(),
+					LauncherModel::COLUMN_TEXT, launcher->get_text(),
+					LauncherModel::COLUMN_LAUNCHER, launcher,
+					-1);
+		}
+		else if ((i + 1) < end)
+		{
+			gtk_list_store_insert_with_values(model,
+					NULL, INT_MAX,
+					LauncherModel::COLUMN_ICON, NULL,
+					LauncherModel::COLUMN_TEXT, NULL,
+					LauncherModel::COLUMN_LAUNCHER, NULL,
+					-1);
+		}
+	}
+}
+
+//-----------------------------------------------------------------------------
+
 void Category::merge()
 {
+	if (!m_has_subcategories)
+	{
+		return;
+	}
+
 	// Find direct subcategories
 	std::vector<Category*> categories;
 	for (std::vector<Element*>::const_iterator i = m_items.begin(), end = m_items.end(); i != end; ++i)
@@ -221,12 +270,6 @@ void Category::merge()
 	}
 	std::vector<Category*>::size_type last_direct = categories.size();
 
-	// Stop if there is nothing to merge
-	if (last_direct == 0)
-	{
-		return;
-	}
-
 	// Recursively find subcategories
 	std::vector<Element*>::size_type count = m_items.size();
 	for (std::vector<Category*>::size_type i = 0; i < categories.size(); ++i)
@@ -265,6 +308,8 @@ void Category::merge()
 	{
 		delete categories.at(i);
 	}
+
+	m_has_subcategories = false;
 }
 
 //-----------------------------------------------------------------------------
diff --git a/src/category.hpp b/src/category.hpp
index 5dc77aa..7f4c995 100644
--- a/src/category.hpp
+++ b/src/category.hpp
@@ -72,6 +72,7 @@ public:
 
 private:
 	void insert_items(GtkTreeStore* model, GtkTreeIter* parent, const gchar* fallback_icon);
+	void insert_items(GtkListStore* model);
 	void merge();
 	void unset_model();
 
@@ -80,6 +81,7 @@ private:
 	std::vector<Element*> m_items;
 	GtkTreeModel* m_model;
 	bool m_has_separators;
+	bool m_has_subcategories;
 };
 
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.