From 60902484fdec9b7793a2d97473ba353e15f79fcd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 23 May 2020 06:37:18 +0200 Subject: [PATCH] applicationwindow: Simplify measure implementation We already chain up first thing in this function, so no need to do it again. --- gtk/gtkapplicationwindow.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index e4835c9c70..07dc9ba812 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -445,25 +445,11 @@ gtk_application_window_measure (GtkWidget *widget, } else /* VERTICAL */ { - GTK_WIDGET_CLASS (gtk_application_window_parent_class)->measure (widget, - orientation, - for_size, - minimum, natural, - minimum_baseline, natural_baseline); - gtk_widget_measure (priv->menubar, orientation, for_size, &menubar_min, &menubar_nat, NULL, NULL); *minimum += menubar_min; *natural += menubar_nat; } } - else - { - GTK_WIDGET_CLASS (gtk_application_window_parent_class)->measure (widget, - orientation, - for_size, - minimum, natural, - minimum_baseline, natural_baseline); - } } static void -- 2.30.2