From e15c121f7703b2fe328753fe6be4cc59001b036e Mon Sep 17 00:00:00 2001 From: monsta Date: Tue, 11 Apr 2017 14:04:48 +0300 Subject: GTK+3: properly fit expanded panel to smaller screen size port of 471d39d57525d5d25208d776992336ec8c81c62f to mixed GTK+2/3 code --- mate-panel/panel-widget.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c index b77446d9..a36b14ac 100644 --- a/mate-panel/panel-widget.c +++ b/mate-panel/panel-widget.c @@ -1334,17 +1334,13 @@ panel_widget_size_request(GtkWidget *widget, GtkRequisition *minimum_size) panel->applets_using_hint = NULL; if (!panel->packed) { +#if !GTK_CHECK_VERSION (3, 0, 0) if (panel->orient == GTK_ORIENTATION_HORIZONTAL) { minimum_size->width = panel->size; -#if GTK_CHECK_VERSION (3, 0, 0) - natural_size->width = panel->size; -#endif } else { minimum_size->height = panel->size; -#if GTK_CHECK_VERSION (3, 0, 0) - natural_size->height = panel->size; -#endif } +#endif } else { /* put the list in the correct order: this is important * since we'll use this order in the size_allocate() */ -- cgit v1.2.1