AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

statusbar: Don't use a frame

Browse Source 
This frame serves no purpose anymore, and now that frames
draw frames, it shows up annoyingly.
This commit is contained in:
Matthias Clasen 2020-04-18 17:29:13 -04:00
parent ef8e8ba14d
commit 45bcffd637
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkstatusbar.c
View File

@ -29,7 +29,6 @@
#include "gtkstatusbarprivate.h"
#include "gtkbinlayout.h"
#include "gtkframe.h"
#include "gtklabel.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
@ -87,7 +86,6 @@ struct _GtkStatusbar
{
GtkWidget parent_instance;
GtkWidget *frame;
GtkWidget *label;
GtkWidget *message_area;
@ -138,7 +136,7 @@ gtk_statusbar_dispose (GObject *object)
{
GtkStatusbar *self = GTK_STATUSBAR (object);
g_clear_pointer (&self->frame, gtk_widget_unparent);
g_clear_pointer (&self->message_area, gtk_widget_unparent);
G_OBJECT_CLASS (gtk_statusbar_parent_class)->dispose (object);
}
@ -200,7 +198,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkstatusbar.ui");
gtk_widget_class_bind_template_child_internal (widget_class, GtkStatusbar, message_area);
gtk_widget_class_bind_template_child (widget_class, GtkStatusbar, frame);
gtk_widget_class_bind_template_child (widget_class, GtkStatusbar, label);
gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);

19
gtk/ui/gtkstatusbar.ui
View File

@ -2,22 +2,17 @@
<interface domain="gtk40">
<template class="GtkStatusbar" parent="GtkWidget">
<child>
<object class="GtkFrame" id="frame">
<object class="GtkBox" id="message_area">
<property name="hexpand">1</property>
<property name="spacing">4</property>
<child>
<object class="GtkBox" id="message_area">
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="label">
<property name="halign">start</property>
<property name="valign">center</property>
<property name="ellipsize">end</property>
<property name="single-line-mode">1</property>
</object>
</child>
<object class="GtkLabel" id="label">
<property name="halign">start</property>
<property name="valign">center</property>
<property name="ellipsize">end</property>
<property name="single-line-mode">1</property>
</object>
</child>
<child type="label_item"/>
</object>
</child>
</template>