libsysprof-gtk: make track subclassable

The goal here is that we can move a bunch of the machinery to create
charts into subclasses rather than one sort of annoying convoluted layer.
This commit is contained in:
Christian Hergert
2023-06-29 12:23:34 -07:00
parent 6e476b683a
commit 821bfc9bdf
2 changed files with 38 additions and 13 deletions

View File

@ -22,12 +22,11 @@
#include "sysprof-track-private.h" #include "sysprof-track-private.h"
struct _SysprofTrack typedef struct _SysprofTrackPrivate
{ {
GObject parent_instance;
GListStore *subtracks; GListStore *subtracks;
char *title; char *title;
}; } SysprofTrackPrivate;
enum { enum {
PROP_0, PROP_0,
@ -36,7 +35,7 @@ enum {
N_PROPS N_PROPS
}; };
G_DEFINE_FINAL_TYPE (SysprofTrack, sysprof_track, G_TYPE_OBJECT) G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (SysprofTrack, sysprof_track, G_TYPE_OBJECT)
static GParamSpec *properties [N_PROPS]; static GParamSpec *properties [N_PROPS];
@ -44,9 +43,10 @@ static void
sysprof_track_dispose (GObject *object) sysprof_track_dispose (GObject *object)
{ {
SysprofTrack *self = (SysprofTrack *)object; SysprofTrack *self = (SysprofTrack *)object;
SysprofTrackPrivate *priv = sysprof_track_get_instance_private (self);
g_clear_object (&self->subtracks); g_clear_object (&priv->subtracks);
g_clear_pointer (&self->title, g_free); g_clear_pointer (&priv->title, g_free);
G_OBJECT_CLASS (sysprof_track_parent_class)->dispose (object); G_OBJECT_CLASS (sysprof_track_parent_class)->dispose (object);
} }
@ -62,7 +62,7 @@ sysprof_track_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_SUBTRACKS: case PROP_SUBTRACKS:
g_value_set_object (value, self->subtracks); g_value_take_object (value, sysprof_track_list_subtracks (self));
break; break;
case PROP_TITLE: case PROP_TITLE:
@ -81,11 +81,12 @@ sysprof_track_set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
SysprofTrack *self = SYSPROF_TRACK (object); SysprofTrack *self = SYSPROF_TRACK (object);
SysprofTrackPrivate *priv = sysprof_track_get_instance_private (self);
switch (prop_id) switch (prop_id)
{ {
case PROP_TITLE: case PROP_TITLE:
self->title = g_value_dup_string (value); priv->title = g_value_dup_string (value);
break; break;
default: default:
@ -118,26 +119,32 @@ sysprof_track_class_init (SysprofTrackClass *klass)
static void static void
sysprof_track_init (SysprofTrack *self) sysprof_track_init (SysprofTrack *self)
{ {
self->subtracks = g_list_store_new (SYSPROF_TYPE_TRACK); SysprofTrackPrivate *priv = sysprof_track_get_instance_private (self);
priv->subtracks = g_list_store_new (SYSPROF_TYPE_TRACK);
} }
const char * const char *
sysprof_track_get_title (SysprofTrack *self) sysprof_track_get_title (SysprofTrack *self)
{ {
SysprofTrackPrivate *priv = sysprof_track_get_instance_private (self);
g_return_val_if_fail (SYSPROF_IS_TRACK (self), NULL); g_return_val_if_fail (SYSPROF_IS_TRACK (self), NULL);
return self->title; return priv->title;
} }
void void
_sysprof_track_add_subtrack (SysprofTrack *self, _sysprof_track_add_subtrack (SysprofTrack *self,
SysprofTrack *subtrack) SysprofTrack *subtrack)
{ {
SysprofTrackPrivate *priv = sysprof_track_get_instance_private (self);
g_return_if_fail (SYSPROF_IS_TRACK (self)); g_return_if_fail (SYSPROF_IS_TRACK (self));
g_return_if_fail (SYSPROF_IS_TRACK (subtrack)); g_return_if_fail (SYSPROF_IS_TRACK (subtrack));
g_return_if_fail (subtrack != self); g_return_if_fail (subtrack != self);
g_list_store_append (self->subtracks, subtrack); g_list_store_append (priv->subtracks, subtrack);
} }
/** /**
@ -149,7 +156,9 @@ _sysprof_track_add_subtrack (SysprofTrack *self,
GListModel * GListModel *
sysprof_track_list_subtracks (SysprofTrack *self) sysprof_track_list_subtracks (SysprofTrack *self)
{ {
SysprofTrackPrivate *priv = sysprof_track_get_instance_private (self);
g_return_val_if_fail (SYSPROF_IS_TRACK (self), NULL); g_return_val_if_fail (SYSPROF_IS_TRACK (self), NULL);
return g_object_ref (G_LIST_MODEL (self->subtracks)); return g_object_ref (G_LIST_MODEL (priv->subtracks));
} }

View File

@ -20,6 +20,8 @@
#pragma once #pragma once
#include <gtk/gtk.h>
#include <sysprof-analyze.h> #include <sysprof-analyze.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -27,11 +29,25 @@ G_BEGIN_DECLS
#define SYSPROF_TYPE_TRACK (sysprof_track_get_type()) #define SYSPROF_TYPE_TRACK (sysprof_track_get_type())
SYSPROF_AVAILABLE_IN_ALL SYSPROF_AVAILABLE_IN_ALL
G_DECLARE_FINAL_TYPE (SysprofTrack, sysprof_track, SYSPROF, TRACK, GObject) G_DECLARE_DERIVABLE_TYPE (SysprofTrack, sysprof_track, SYSPROF, TRACK, GObject)
struct _SysprofTrackClass
{
GObjectClass parent_class;
GtkWidget *(*create_chart) (SysprofTrack *self);
/*< private >*/
gpointer _reserved[16];
};
SYSPROF_AVAILABLE_IN_ALL SYSPROF_AVAILABLE_IN_ALL
const char *sysprof_track_get_title (SysprofTrack *self); const char *sysprof_track_get_title (SysprofTrack *self);
SYSPROF_AVAILABLE_IN_ALL SYSPROF_AVAILABLE_IN_ALL
GListModel *sysprof_track_list_subtracks (SysprofTrack *self); GListModel *sysprof_track_list_subtracks (SysprofTrack *self);
SYSPROF_AVAILABLE_IN_ALL
GMenuModel *sysprof_track_get_menu_model (SysprofTrack *self);
SYSPROF_AVAILABLE_IN_ALL
GtkWidget *sysprof_track_create_chart (SysprofTrack *self);
G_END_DECLS G_END_DECLS