[gtk/wip/baedert/for-master: 47/47] applicationwindow: Simplify measure implementation



commit 9f360142959ed3e0c6786aa2aa0bbda817cb2749
Author: Timm Bäder <mail baedert org>
Date:   Sat May 23 06:37:18 2020 +0200

    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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]