From cb772695f686dc674d93dd540d1e8da998505d9e Mon Sep 17 00:00:00 2001 From: Graeme Gott Date: Tue, 11 Feb 2020 18:15:27 -0500 Subject: [PATCH] Set icon renderer stretch property in constructor. --- panel-plugin/icon-renderer.cpp | 9 +++++++-- panel-plugin/icon-renderer.h | 2 +- panel-plugin/launcher-icon-view.cpp | 3 +-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/panel-plugin/icon-renderer.cpp b/panel-plugin/icon-renderer.cpp index 5fb790c8..d3bde836 100644 --- a/panel-plugin/icon-renderer.cpp +++ b/panel-plugin/icon-renderer.cpp @@ -285,9 +285,14 @@ static void whiskermenu_icon_renderer_init(WhiskerMenuIconRenderer*) //----------------------------------------------------------------------------- -GtkCellRenderer* whiskermenu_icon_renderer_new() +GtkCellRenderer* whiskermenu_icon_renderer_new(bool stretch) { - return GTK_CELL_RENDERER(g_object_new(WHISKERMENU_TYPE_ICON_RENDERER, nullptr)); + gpointer object = g_object_new(WHISKERMENU_TYPE_ICON_RENDERER, nullptr); + + WhiskerMenuIconRenderer* icon_renderer = WHISKERMENU_ICON_RENDERER(object); + icon_renderer->stretch = stretch; + + return GTK_CELL_RENDERER(icon_renderer); } //----------------------------------------------------------------------------- diff --git a/panel-plugin/icon-renderer.h b/panel-plugin/icon-renderer.h index ec3e33c3..f5fc69f9 100644 --- a/panel-plugin/icon-renderer.h +++ b/panel-plugin/icon-renderer.h @@ -20,6 +20,6 @@ #include -GtkCellRenderer* whiskermenu_icon_renderer_new(); +GtkCellRenderer* whiskermenu_icon_renderer_new(bool stretch = false); #endif diff --git a/panel-plugin/launcher-icon-view.cpp b/panel-plugin/launcher-icon-view.cpp index e5328d13..7c3d655c 100644 --- a/panel-plugin/launcher-icon-view.cpp +++ b/panel-plugin/launcher-icon-view.cpp @@ -34,9 +34,8 @@ LauncherIconView::LauncherIconView() : // Create the view m_view = GTK_ICON_VIEW(gtk_icon_view_new()); - m_icon_renderer = whiskermenu_icon_renderer_new(); + m_icon_renderer = whiskermenu_icon_renderer_new(true); g_object_set(m_icon_renderer, - "stretch", true, "xalign", 0.5, "yalign", 1.0, nullptr); -- 2.25.0