visualizergroupheader: port to GTK 4

This commit is contained in:
Christian Hergert
2021-10-01 11:12:34 -07:00
parent 5ca7baa688
commit dfe44cc724

View File

@ -38,17 +38,28 @@ struct _SysprofVisualizerGroupHeader
G_DEFINE_TYPE (SysprofVisualizerGroupHeader, sysprof_visualizer_group_header, GTK_TYPE_LIST_BOX_ROW) G_DEFINE_TYPE (SysprofVisualizerGroupHeader, sysprof_visualizer_group_header, GTK_TYPE_LIST_BOX_ROW)
static void static void
sysprof_visualizer_group_header_finalize (GObject *object) sysprof_visualizer_group_header_dispose (GObject *object)
{ {
G_OBJECT_CLASS (sysprof_visualizer_group_header_parent_class)->finalize (object); SysprofVisualizerGroupHeader *self = (SysprofVisualizerGroupHeader *)object;
if (self->box)
{
gtk_widget_unparent (GTK_WIDGET (self->box));
self->box = NULL;
}
G_OBJECT_CLASS (sysprof_visualizer_group_header_parent_class)->dispose (object);
} }
static void static void
sysprof_visualizer_group_header_class_init (SysprofVisualizerGroupHeaderClass *klass) sysprof_visualizer_group_header_class_init (SysprofVisualizerGroupHeaderClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = sysprof_visualizer_group_header_finalize; object_class->dispose = sysprof_visualizer_group_header_dispose;
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
} }
static void static void
@ -58,7 +69,7 @@ sysprof_visualizer_group_header_init (SysprofVisualizerGroupHeader *self)
"orientation", GTK_ORIENTATION_VERTICAL, "orientation", GTK_ORIENTATION_VERTICAL,
"visible", TRUE, "visible", TRUE,
NULL); NULL);
gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->box)); gtk_widget_set_parent (GTK_WIDGET (self->box), GTK_WIDGET (self));
} }
void void
@ -68,8 +79,9 @@ _sysprof_visualizer_group_header_add_row (SysprofVisualizerGroupHeader *self,
GMenuModel *menu, GMenuModel *menu,
GtkWidget *widget) GtkWidget *widget)
{ {
GtkBox *box;
GtkWidget *group; GtkWidget *group;
GtkWidget *sibling;
GtkBox *box;
g_return_if_fail (SYSPROF_IS_VISUALIZER_GROUP_HEADER (self)); g_return_if_fail (SYSPROF_IS_VISUALIZER_GROUP_HEADER (self));
g_return_if_fail (SYSPROF_IS_VISUALIZER (widget)); g_return_if_fail (SYSPROF_IS_VISUALIZER (widget));
@ -81,9 +93,11 @@ _sysprof_visualizer_group_header_add_row (SysprofVisualizerGroupHeader *self,
"visible", TRUE, "visible", TRUE,
NULL); NULL);
g_object_bind_property (widget, "visible", box, "visible", G_BINDING_SYNC_CREATE); g_object_bind_property (widget, "visible", box, "visible", G_BINDING_SYNC_CREATE);
gtk_container_add_with_properties (GTK_CONTAINER (self->box), GTK_WIDGET (box),
"position", position, sibling = gtk_widget_get_first_child (GTK_WIDGET (self->box));
NULL); for (; position > 1 && sibling; position--)
sibling = gtk_widget_get_next_sibling (sibling);
gtk_box_insert_child_after (self->box, GTK_WIDGET (box), sibling);
if (title != NULL) if (title != NULL)
{ {
@ -101,7 +115,7 @@ _sysprof_visualizer_group_header_add_row (SysprofVisualizerGroupHeader *self,
"visible", TRUE, "visible", TRUE,
"xalign", 0.0f, "xalign", 0.0f,
NULL); NULL);
gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (label)); gtk_box_append (box, GTK_WIDGET (label));
pango_attr_list_unref (attrs); pango_attr_list_unref (attrs);
gtk_size_group_add_widget (size_group, widget); gtk_size_group_add_widget (size_group, widget);
@ -121,7 +135,7 @@ _sysprof_visualizer_group_header_add_row (SysprofVisualizerGroupHeader *self,
"visible", TRUE, "visible", TRUE,
NULL); NULL);
gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (image)), "dim-label"); gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (image)), "dim-label");
gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (image)); gtk_box_append (box, GTK_WIDGET (image));
} }
if (menu != NULL) if (menu != NULL)
@ -148,7 +162,7 @@ _sysprof_visualizer_group_header_add_row (SysprofVisualizerGroupHeader *self,
gtk_style_context_add_class (style_context, "small-button"); gtk_style_context_add_class (style_context, "small-button");
gtk_style_context_add_class (style_context, "flat"); gtk_style_context_add_class (style_context, "flat");
gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (button)); gtk_box_append (box, GTK_WIDGET (button));
} }
} }