From 3bd907eaea70e02fb57f8736e36d324318fbafc0 Mon Sep 17 00:00:00 2001 From: Graeme Gott Date: Wed, 18 Oct 2017 16:05:06 -0400 Subject: [PATCH] Defer loading launcher icons until menu is shown. --- panel-plugin/launcher-view.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/panel-plugin/launcher-view.cpp b/panel-plugin/launcher-view.cpp index 7891f9e..62fb72f 100644 --- a/panel-plugin/launcher-view.cpp +++ b/panel-plugin/launcher-view.cpp @@ -43,6 +43,7 @@ static gboolean is_separator(GtkTreeModel* model, GtkTreeIter* iter, gpointer) LauncherView::LauncherView(Window* window) : m_window(window), m_model(NULL), + m_column(NULL), m_icon_size(0), m_pressed_launcher(NULL), m_drag_enabled(true), @@ -59,7 +60,6 @@ LauncherView::LauncherView(Window* window) : gtk_tree_view_set_enable_search(m_view, false); gtk_tree_view_set_fixed_height_mode(m_view, true); gtk_tree_view_set_row_separator_func(m_view, &is_separator, NULL, NULL); - create_column(); g_signal_connect_slot(m_view, "key-press-event", &LauncherView::on_key_press_event, this); g_signal_connect_slot(m_view, "key-release-event", &LauncherView::on_key_release_event, this); @@ -238,7 +238,11 @@ void LauncherView::unset_model() void LauncherView::reload_icon_size() { // Force exo to reload SVG icons - if (m_icon_size != wm_settings->launcher_icon_size.get_size()) + if (!m_column) + { + create_column(); + } + else if (m_icon_size != wm_settings->launcher_icon_size.get_size()) { gtk_tree_view_remove_column(m_view, m_column); create_column(); -- 2.14.2