From: Timm Bäder <mail@baedert.org>
Date: Sat, 23 May 2020 04:37:18 +0000 (+0200)
Subject: applicationwindow: Simplify measure implementation
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~16^2~115
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=60902484fdec9b7793a2d97473ba353e15f79fcd;p=gtk4.git

applicationwindow: Simplify measure implementation

We already chain up first thing in this function, so no need to do it
again.
---

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