varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsysprof-ui: inherit visualizer from GtkWidget

Browse Source
This commit is contained in:
Christian Hergert
2021-09-28 15:35:56 -07:00
parent 36a9e37ee2
commit 234d37ea12
2 changed files with 10 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/libsysprof-ui/sysprof-visualizer.c
View File

@ -31,14 +31,9 @@ typedef struct
gint64 begin_time;
gint64 end_time;
gint64 duration;
/* A cached allocation that has the borders subtracted so that
* we place the content within the expected area.
*/
GtkAllocation cache_alloc;
} SysprofVisualizerPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (SysprofVisualizer, sysprof_visualizer, GTK_TYPE_BIN)
G_DEFINE_TYPE_WITH_PRIVATE (SysprofVisualizer, sysprof_visualizer, GTK_TYPE_WIDGET)
enum {
PROP_0,
@ -50,53 +45,6 @@ enum {
static GParamSpec *properties [N_PROPS];
static inline void
subtract_border (GtkAllocation *alloc,
GtkBorder *border)
{
#if 0
g_print ("Border; %d %d %d %d\n", border->top, border->left, border->bottom, border->right);
#endif
alloc->x += border->left;
alloc->y += border->top;
alloc->width -= border->left + border->right;
alloc->height -= border->top + border->bottom;
}
static void
adjust_alloc_for_borders (SysprofVisualizer *self,
GtkAllocation *alloc)
{
GtkStyleContext *style_context;
GtkBorder border;
GtkStateFlags state;
g_assert (SYSPROF_IS_VISUALIZER (self));
g_assert (alloc != NULL);
state = gtk_widget_get_state_flags (GTK_WIDGET (self));
style_context = gtk_widget_get_style_context (GTK_WIDGET (self));
gtk_style_context_get_border (style_context, state, &border);
subtract_border (alloc, &border);
}
static void
sysprof_visualizer_size_allocate (GtkWidget *widget,
GtkAllocation *alloc)
{
SysprofVisualizer *self = (SysprofVisualizer *)widget;
SysprofVisualizerPrivate *priv = sysprof_visualizer_get_instance_private (self);
g_assert (SYSPROF_IS_VISUALIZER (self));
GTK_WIDGET_CLASS (sysprof_visualizer_parent_class)->size_allocate (widget, alloc);
priv->cache_alloc = *alloc;
adjust_alloc_for_borders (self, &priv->cache_alloc);
}
static void
sysprof_visualizer_finalize (GObject *object)
{
@ -175,8 +123,6 @@ sysprof_visualizer_class_init (SysprofVisualizerClass *klass)
object_class->get_property = sysprof_visualizer_get_property;
object_class->set_property = sysprof_visualizer_set_property;
widget_class->size_allocate = sysprof_visualizer_size_allocate;
properties [PROP_BEGIN_TIME] =
g_param_spec_int64 ("begin-time",
"Begin Time",
@ -296,20 +242,21 @@ sysprof_visualizer_translate_points (SysprofVisualizer *self,
SysprofVisualizerAbsolutePoint *out_points,
guint n_out_points)
{
SysprofVisualizerPrivate *priv = sysprof_visualizer_get_instance_private (self);
const GtkAllocation *a;
int width;
int height;
g_return_if_fail (SYSPROF_IS_VISUALIZER (self));
g_return_if_fail (in_points != NULL);
g_return_if_fail (out_points != NULL);
g_return_if_fail (n_in_points == n_out_points);
a = &priv->cache_alloc;
width = gtk_widget_get_width (GTK_WIDGET (self));
height = gtk_widget_get_height (GTK_WIDGET (self));
for (guint i = 0; i < n_in_points; i++)
{
out_points[i].x = (in_points[i].x * a->width);
out_points[i].y = a->height - (ABS (in_points[i].y) * a->height);
out_points[i].x = (in_points[i].x * width);
out_points[i].y = height - (ABS (in_points[i].y) * height);
}
}
@ -319,7 +266,7 @@ sysprof_visualizer_get_x_for_time (SysprofVisualizer *self,
{
SysprofVisualizerPrivate *priv = sysprof_visualizer_get_instance_private (self);
return ((time - priv->begin_time) / (gdouble)priv->duration) * priv->cache_alloc.width;
return ((time - priv->begin_time) / (gdouble)priv->duration) * gtk_widget_get_width (GTK_WIDGET (self));
}
void

4
src/libsysprof-ui/sysprof-visualizer.h
View File

@ -44,11 +44,11 @@ typedef struct
#define SYSPROF_TYPE_VISUALIZER (sysprof_visualizer_get_type())
SYSPROF_AVAILABLE_IN_ALL
G_DECLARE_DERIVABLE_TYPE (SysprofVisualizer, sysprof_visualizer, SYSPROF, VISUALIZER, GtkBin)
G_DECLARE_DERIVABLE_TYPE (SysprofVisualizer, sysprof_visualizer, SYSPROF, VISUALIZER, GtkWidget)
struct _SysprofVisualizerClass
{
GtkBinClass parent_class;
GtkWidgetClass parent_class;
void (*set_reader) (SysprofVisualizer *self,
SysprofCaptureReader *reader);