[glom/gtkmm4v4: 13/37] gtk4: gimpruler: Change get_preferred_*() to measure().

[Murray Cumming <murrayc src gnome org>]

commit 22c6fc59b7832662010811d3a01ca10a1f660318
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Dec 18 12:30:37 2016 +0100

    gtk4: gimpruler: Change get_preferred_*() to measure().
    
    This is not in upstream gimp, because there is no gtk4 branch.
    Even the gtk3 branch is not in master yet:
    https://git.gnome.org/browse/gimp/log/?h=gtk3-port

 glom/utility_widgets/gimpruler/gimpruler.c |   50 +++++++++++++++------------
 1 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/glom/utility_widgets/gimpruler/gimpruler.c b/glom/utility_widgets/gimpruler/gimpruler.c
index 3f5ec6d..bedfba6 100644
--- a/glom/utility_widgets/gimpruler/gimpruler.c
+++ b/glom/utility_widgets/gimpruler/gimpruler.c
@@ -120,12 +120,13 @@ static void          gimp_ruler_map                   (GtkWidget      *widget);
 static void          gimp_ruler_unmap                 (GtkWidget      *widget);
 static void          gimp_ruler_size_allocate         (GtkWidget      *widget,
                                                        GtkAllocation  *allocation);
-static void          gimp_ruler_get_preferred_width   (GtkWidget      *widget,
-                                                       gint           *minimum_width,
-                                                       gint           *natural_width);
-static void          gimp_ruler_get_preferred_height  (GtkWidget      *widget,
-                                                       gint           *minimum_height,
-                                                       gint           *natural_height);
+static void          gimp_ruler_measure               (GtkWidget      *widget,
+                                                       GtkOrientation  orientation,
+                                                       int             for_size,
+                                                       int            *minimum,
+                                                       int            *natural,
+                                                       int            *minimum_baseline,
+                                                       int            *natural_baseline);
 static void          gimp_ruler_style_updated         (GtkWidget      *widget);
 static gboolean      gimp_ruler_motion_notify         (GtkWidget      *widget,
                                                        GdkEventMotion *event);
@@ -164,8 +165,7 @@ gimp_ruler_class_init (GimpRulerClass *klass)
   widget_class->unrealize            = gimp_ruler_unrealize;
   widget_class->map                  = gimp_ruler_map;
   widget_class->unmap                = gimp_ruler_unmap;
-  widget_class->get_preferred_width  = gimp_ruler_get_preferred_width;
-  widget_class->get_preferred_height = gimp_ruler_get_preferred_height;
+  widget_class->measure              = gimp_ruler_measure;
   widget_class->size_allocate        = gimp_ruler_size_allocate;
   widget_class->style_updated        = gimp_ruler_style_updated;
   widget_class->motion_notify_event  = gimp_ruler_motion_notify;
@@ -924,27 +924,33 @@ gimp_ruler_size_request (GtkWidget      *widget,
 }
 
 static void
-gimp_ruler_get_preferred_width (GtkWidget *widget,
-                                gint      *minimum_width,
-                                gint      *natural_width)
+gimp_ruler_measure (GtkWidget      *widget,
+                    GtkOrientation  orientation,
+                    G_GNUC_UNUSED int             for_size,
+                    int            *minimum,
+                    int            *natural,
+                    int            *minimum_baseline,
+                    int            *natural_baseline)
 {
   GtkRequisition requisition;
+  /* TODO: Use for_size? */
 
   gimp_ruler_size_request (widget, &requisition);
 
-  *minimum_width = *natural_width = requisition.width;
-}
-
-static void
-gimp_ruler_get_preferred_height (GtkWidget *widget,
-                                 gint      *minimum_height,
-                                 gint      *natural_height)
-{
-  GtkRequisition requisition;
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      *minimum = requisition.width;
+    }
+  else
+    {
+      *minimum = requisition.height;
+    }
 
-  gimp_ruler_size_request (widget, &requisition);
+  *natural = *minimum;
 
-  *minimum_height = *natural_height = requisition.height;
+  /* TODO? */
+  *minimum_baseline = 0;
+  *natural_baseline = 0;
 }
 
 static void