Apply module icons patch from larsl (with formatting/visual tweaks).

git-svn-id: http://svn.drobilla.net/lad/ingen@901 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 32 insertions, 7 deletions

diff --git a/src/libs/gui/App.cpp b/src/libs/gui/App.cpp
index 997ae791..78f9e6e8 100644
--- a/src/libs/gui/App.cpp
+++ b/src/libs/gui/App.cpp
@@ -356,24 +356,49 @@ App::quit()
 
 
 Glib::RefPtr<Gdk::Pixbuf>
-App::icon_from_path(const string& path)
+App::icon_from_path(const string& path, int size)
 {
-	map<string, Glib::RefPtr<Gdk::Pixbuf> >::iterator iter = _icons.find(path);
+	/* If weak references to Glib::Objects are needed somewhere else it will
+	   probably be a good idea to create a proper WeakPtr class instead of
+	   using raw pointers, but for a single use this will do. */
 
-	if (iter != _icons.end())
-		return iter->second;
+	IconMap::iterator iter = _icons.find(make_pair(path, size));
+
+	if (iter != _icons.end()) {
+		// we need to reference manually since the RefPtr constructor doesn't do it
+		iter->second->reference();
+		return Glib::RefPtr<Gdk::Pixbuf>(iter->second);
+	}
 
 	Glib::RefPtr<Gdk::Pixbuf> buf;
 	try {
-		buf = Gdk::Pixbuf::create_from_file(path, 20, 20);
-		_icons.insert(make_pair(path, buf));
+		buf = Gdk::Pixbuf::create_from_file(path, size, size);
+		_icons.insert(make_pair(make_pair(path, size), buf.operator->()));
+		buf->add_destroy_notify_callback(new pair<string, int>(path, size),
+				&App::icon_destroyed);
+		cerr << "Loaded icon " << path << " with size " << size << endl;
 	} catch (...) {
-		buf = Glib::RefPtr<Gdk::Pixbuf>(0);
+		cerr << "Caught exception, failed to load icon " << path << endl;
 	}
 	return buf;
 }
 
 
+void*
+App::icon_destroyed(void* data)
+{
+	pair<string, int>* p = static_cast<pair<string, int>*>(data);
+	cerr << "Destroyed icon " << p->first << " with size " << p->second << endl;
+	IconMap::iterator iter = instance()._icons.find(*p);
+	if (iter != instance()._icons.end())
+		instance()._icons.erase(iter);
+	
+	delete p; // allocated in App::icon_from_path
+	
+	return NULL;
+}
+
+
 } // namespace GUI
 } // namespace Ingen