AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

inspector: Make the measure map buttons work again

Browse Source 
The show/hide => set_visible() cleanups had broken things.

Fixes #5992
This commit is contained in:
Benjamin Otte 2023-08-01 00:09:07 +02:00
parent 5d18ea621d
commit 424c4b4150
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gtk/inspector/misc-info.c
View File

@ -141,6 +141,37 @@ state_flags_changed (GtkWidget *w, GtkStateFlags old_flags, GtkInspectorMiscInfo
g_free (s);
}
static void
update_measure_picture (GtkPicture *picture,
GtkToggleButton *toggle)
{
GdkPaintable *paintable = gtk_picture_get_paintable (picture);
if (gtk_toggle_button_get_active (toggle) ||
(gdk_paintable_get_intrinsic_width (paintable) <= 200 &&
gdk_paintable_get_intrinsic_height (paintable) <= 100))
{
gtk_picture_set_can_shrink (picture, FALSE);
gtk_widget_set_size_request (GTK_WIDGET (picture), -1, -1);
}
else
{
gtk_picture_set_can_shrink (picture, TRUE);
gtk_widget_set_size_request (GTK_WIDGET (picture),
-1,
MIN (100, 200 / gdk_paintable_get_intrinsic_aspect_ratio (paintable)));
}
}
static void
measure_graph_measure (GtkInspectorMiscInfo *sl)
{
if (gtk_widget_get_visible (sl->measure_row))
gtk_inspector_measure_graph_measure (GTK_INSPECTOR_MEASURE_GRAPH (sl->measure_graph), GTK_WIDGET (sl->object));
update_measure_picture (GTK_PICTURE (sl->measure_picture), GTK_TOGGLE_BUTTON (sl->measure_expand_toggle));
}
static void
update_allocation (GtkWidget *w,
GtkInspectorMiscInfo *sl)
@ -169,15 +200,7 @@ update_allocation (GtkWidget *w,
gtk_label_set_label (GTK_LABEL (sl->request_mode), value->value_nick);
g_type_class_unref (class);
if (gtk_widget_get_visible (sl->measure_row))
gtk_inspector_measure_graph_measure (GTK_INSPECTOR_MEASURE_GRAPH (sl->measure_graph), w);
}
static void
measure_graph_measure (GtkWidget *button,
GtkInspectorMiscInfo *sl)
{
gtk_inspector_measure_graph_measure (GTK_INSPECTOR_MEASURE_GRAPH (sl->measure_graph), GTK_WIDGET (sl->object));
measure_graph_measure (sl);
}
static void
@ -461,28 +484,6 @@ measure_picture_drag_prepare (GtkDragSource *source,
return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, texture);
}
static void
update_measure_picture (GtkPicture *picture,
GtkToggleButton *toggle)
{
GdkPaintable *paintable = gtk_picture_get_paintable (picture);
if (gtk_toggle_button_get_active (toggle) ||
(gdk_paintable_get_intrinsic_width (paintable) <= 200 &&
gdk_paintable_get_intrinsic_height (paintable) <= 100))
{
gtk_picture_set_can_shrink (picture, FALSE);
gtk_widget_set_size_request (GTK_WIDGET (picture), -1, -1);
}
else
{
gtk_picture_set_can_shrink (picture, TRUE);
gtk_widget_set_size_request (GTK_WIDGET (picture),
-1,
MIN (100, 200 / gdk_paintable_get_intrinsic_aspect_ratio (paintable)));
}
}
void
gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl,
GObject *object)
@ -507,7 +508,9 @@ gtk_inspector_misc_info_set_object (GtkInspectorMiscInfo *sl,
gtk_widget_set_visible (sl->request_mode_row, GTK_IS_WIDGET (object));
gtk_widget_set_visible (sl->bounds_row, GTK_IS_WIDGET (object));
gtk_widget_set_visible (sl->baseline_row, GTK_IS_WIDGET (object));
gtk_widget_set_visible (sl->measure_row, GTK_IS_WIDGET (object));
/* Don't autoshow, it may be slow, we have a button for this */
if (!GTK_IS_WIDGET (object))
gtk_widget_set_visible (sl->measure_row, FALSE);
gtk_widget_set_visible (sl->measure_info_row, GTK_IS_WIDGET (object));
gtk_widget_set_visible (sl->mnemonic_label_row, GTK_IS_WIDGET (object));
gtk_widget_set_visible (sl->tick_callback_row, GTK_IS_WIDGET (object));

3
gtk/inspector/misc-info.ui
View File

@ -245,8 +245,7 @@
<property name="label" translatable="yes">Show</property>
<property name="halign">end</property>
<property name="valign">baseline</property>
<signal name="clicked" handler="update_measure_picture" swapped="yes" after="1" object="measure_picture"/>
<signal name="clicked" handler="measure_graph_measure" after="1"/>
<signal name="clicked" handler="measure_graph_measure" after="1" swapped="yes"/>
</object>
</child>
<child>