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

tab: don't inherit from GtkBox

Browse Source 
We need center box anyway, which does not expose the class.
This commit is contained in:
Christian Hergert
2021-10-01 13:27:18 -07:00
parent fe290a588b
commit 1085fbb6c5
3 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsysprof-ui/sysprof-tab.c
View File

@ -28,8 +28,9 @@
struct _SysprofTab struct _SysprofTab
{ {
GtkBox parent_instance; GtkWidget parent_instance;
GtkWidget *center_box;
GtkButton *close_button; GtkButton *close_button;
GtkLabel *title; GtkLabel *title;
GtkImage *recording; GtkImage *recording;
@ -37,7 +38,7 @@ struct _SysprofTab
SysprofDisplay *display; SysprofDisplay *display;
}; };
G_DEFINE_TYPE (SysprofTab, sysprof_tab, GTK_TYPE_BOX) G_DEFINE_TYPE (SysprofTab, sysprof_tab, GTK_TYPE_WIDGET)
enum { enum {
PROP_0, PROP_0,
@ -71,6 +72,7 @@ sysprof_tab_dispose (GObject *object)
{ {
SysprofTab *self = (SysprofTab *)object; SysprofTab *self = (SysprofTab *)object;
g_clear_pointer (&self->center_box, gtk_widget_unparent);
g_clear_weak_pointer (&self->display); g_clear_weak_pointer (&self->display);
G_OBJECT_CLASS (sysprof_tab_parent_class)->dispose (object); G_OBJECT_CLASS (sysprof_tab_parent_class)->dispose (object);
@ -127,6 +129,8 @@ sysprof_tab_class_init (SysprofTabClass *klass)
object_class->set_property = sysprof_tab_set_property; object_class->set_property = sysprof_tab_set_property;
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/ui/sysprof-tab.ui"); gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/ui/sysprof-tab.ui");
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
gtk_widget_class_bind_template_child (widget_class, SysprofTab, center_box);
gtk_widget_class_bind_template_child (widget_class, SysprofTab, close_button); gtk_widget_class_bind_template_child (widget_class, SysprofTab, close_button);
gtk_widget_class_bind_template_child (widget_class, SysprofTab, recording); gtk_widget_class_bind_template_child (widget_class, SysprofTab, recording);
gtk_widget_class_bind_template_child (widget_class, SysprofTab, title); gtk_widget_class_bind_template_child (widget_class, SysprofTab, title);

2
src/libsysprof-ui/sysprof-tab.h
View File

@ -28,7 +28,7 @@ G_BEGIN_DECLS
#define SYSPROF_TYPE_TAB (sysprof_tab_get_type()) #define SYSPROF_TYPE_TAB (sysprof_tab_get_type())
G_DECLARE_FINAL_TYPE (SysprofTab, sysprof_tab, SYSPROF, TAB, GtkBox) G_DECLARE_FINAL_TYPE (SysprofTab, sysprof_tab, SYSPROF, TAB, GtkWidget)
GtkWidget *sysprof_tab_new (SysprofDisplay *display); GtkWidget *sysprof_tab_new (SysprofDisplay *display);

75
src/libsysprof-ui/sysprof-tab.ui
View File

@ -1,60 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.0"/> <template class="SysprofTab" parent="GtkWidget">
<template class="SysprofTab" parent="GtkBox"> <property name="hexpand">true</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkImage" id="recording"> <object class="GtkCenterBox" id="center_box">
<property name="visible">false</property> <child type="start">
<property name="icon-name">media-record-symbolic</property> <object class="GtkImage" id="recording">
<property name="pixel-size">16</property> <property name="visible">false</property>
<property name="hexpand">true</property> <property name="icon-name">media-record-symbolic</property>
<property name="halign">end</property> <property name="pixel-size">16</property>
</object> <property name="hexpand">true</property>
<packing> <property name="halign">end</property>
<property name="expand">True</property> </object>
<property name="fill">True</property> </child>
<property name="position">0</property> <child type="center">
<property name="pack-type">start</property> <object class="GtkLabel" id="title">
</packing> </object>
</child> </child>
<child type="center"> <child type="end">
<object class="GtkLabel" id="title"> <object class="GtkButton" id="close_button">
<property name="visible">True</property> <property name="receives_default">False</property>
<property name="can_focus">False</property> <property name="icon_name">window-close-symbolic</property>
</object> <style>
<packing> <class name="flat"/>
<property name="expand">False</property> <class name="small-button"/>
<property name="fill">True</property> <class name="image-button"/>
<property name="position">0</property> </style>
</packing>
</child>
<child>
<object class="GtkButton" id="close_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">window-close-symbolic</property>
</object> </object>
</child> </child>
<style>
<class name="flat"/>
<class name="small-button"/>
</style>
</object> </object>
<packing>
<property name="pack-type">end</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
</template> </template>
</interface> </interface>