From 57baf6804b63a598db49e2ffcc548dc46b145bea Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 22 Jan 2016 22:24:46 -0500 Subject: [PATCH] inspector: Show baseline value The misc info page already shows the allocation and clip areas, the baseline fits right in. --- gtk/inspector/misc-info.c | 10 ++++++++++ gtk/inspector/misc-info.ui | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/gtk/inspector/misc-info.c b/gtk/inspector/misc-info.c index 7ad9d754e8..cc54d05baf 100644 --- a/gtk/inspector/misc-info.c +++ b/gtk/inspector/misc-info.c @@ -55,6 +55,8 @@ struct _GtkInspectorMiscInfoPrivate { GtkWidget *request_mode; GtkWidget *allocated_size_row; GtkWidget *allocated_size; + GtkWidget *baseline_row; + GtkWidget *baseline; GtkWidget *clip_area_row; GtkWidget *clip_area; GtkWidget *tick_callback_row; @@ -147,6 +149,10 @@ allocation_changed (GtkWidget *w, GdkRectangle *allocation, GtkInspectorMiscInfo gtk_label_set_label (GTK_LABEL (sl->priv->allocated_size), size_label); g_free (size_label); + size_label = g_strdup_printf ("%d", gtk_widget_get_allocated_baseline (w)); + gtk_label_set_label (GTK_LABEL (sl->priv->baseline), size_label); + g_free (size_label); + gtk_widget_get_clip (w, &clip); size_label = g_strdup_printf ("%d × %d +%d +%d", @@ -414,6 +420,7 @@ gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl, gtk_widget_show (sl->priv->state_row); gtk_widget_show (sl->priv->request_mode_row); gtk_widget_show (sl->priv->allocated_size_row); + gtk_widget_show (sl->priv->baseline_row); gtk_widget_show (sl->priv->clip_area_row); gtk_widget_show (sl->priv->mnemonic_label_row); gtk_widget_show (sl->priv->tick_callback_row); @@ -437,6 +444,7 @@ gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl, gtk_widget_hide (sl->priv->request_mode_row); gtk_widget_hide (sl->priv->mnemonic_label_row); gtk_widget_hide (sl->priv->allocated_size_row); + gtk_widget_hide (sl->priv->baseline_row); gtk_widget_hide (sl->priv->clip_area_row); gtk_widget_hide (sl->priv->tick_callback_row); gtk_widget_hide (sl->priv->accessible_role_row); @@ -589,6 +597,8 @@ gtk_inspector_misc_info_class_init (GtkInspectorMiscInfoClass *klass) gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, request_mode); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, allocated_size_row); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, allocated_size); + gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, baseline_row); + gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, baseline); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, clip_area_row); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, clip_area); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, tick_callback_row); diff --git a/gtk/inspector/misc-info.ui b/gtk/inspector/misc-info.ui index 7cc1c227cc..5ed19d3de5 100644 --- a/gtk/inspector/misc-info.ui +++ b/gtk/inspector/misc-info.ui @@ -353,6 +353,40 @@ + + + true + false + + + true + horizontal + 10 + 40 + + + true + Baseline + start + baseline + 0 + + + true + + + + + true + end + baseline + + + + + + + true