From 0a798f3bf0c75d86df7f79e98e7b322d2753e362 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 14 Aug 2020 12:59:22 +0200 Subject: Fix width of menu panes. Fixes AyatanaIndicators/libayatana-indicator#17. --- libayatana-indicator/indicator-ng.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libayatana-indicator/indicator-ng.c b/libayatana-indicator/indicator-ng.c index a2c2102..598a66f 100644 --- a/libayatana-indicator/indicator-ng.c +++ b/libayatana-indicator/indicator-ng.c @@ -311,8 +311,10 @@ static void indicator_ng_menu_size_allocate(GtkWidget *pWidget, GtkAllocation *p GtkStyleContext *pContext = gtk_widget_get_style_context(GTK_WIDGET(self->entry.menu)); gtk_style_context_get_padding(pContext, gtk_style_context_get_state(pContext), &cPadding); gint nBorderWidth = gtk_container_get_border_width(GTK_CONTAINER(self->entry.menu)); - nWidth += (2 * nBorderWidth) + cPadding.left + cPadding.right; - nHeight += (2 * nBorderWidth) + cPadding.top + cPadding.bottom + 12; + gint nIconWidth; + gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &nIconWidth, NULL); + nWidth += (2 * nBorderWidth) + cPadding.left + cPadding.right + (nIconWidth * 3) / 2; + nHeight += (2 * nBorderWidth) + cPadding.top + cPadding.bottom + (nIconWidth * 3) / 4; GdkWindow *pWindow = gtk_widget_get_parent_window(GTK_WIDGET(self->entry.menu)); gdk_window_resize(pWindow, nWidth, nHeight); gtk_menu_reposition(self->entry.menu); -- cgit v1.2.3