Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
bdfdd2c840 | ||
|
cbdd4d3197 |
@@ -4,7 +4,7 @@ AC_PREREQ(2.63.2)
|
||||
|
||||
m4_define(xed_major_version, 1)
|
||||
m4_define(xed_minor_version, 6)
|
||||
m4_define(xed_micro_version, 1)
|
||||
m4_define(xed_micro_version, 2)
|
||||
m4_define(xed_version, xed_major_version.xed_minor_version.xed_micro_version)
|
||||
|
||||
AC_INIT([xed], [xed_version],
|
||||
|
7
debian/changelog
vendored
7
debian/changelog
vendored
@@ -1,3 +1,10 @@
|
||||
xed (1.6.2) sylvia; urgency=medium
|
||||
|
||||
[ JosephMcc ]
|
||||
* xed-status-combo-box: Simplify the widget heirarchy (#185)
|
||||
|
||||
-- Clement Lefebvre <root@linuxmint.com> Fri, 17 Nov 2017 10:42:21 +0000
|
||||
|
||||
xed (1.6.1) sylvia; urgency=medium
|
||||
|
||||
* l10n: Fix localization in TextSize plugin
|
||||
|
@@ -30,7 +30,6 @@ static void menu_deactivate (GtkMenu *menu, XedStatusComboBox *combo);
|
||||
|
||||
struct _XedStatusComboBoxPrivate
|
||||
{
|
||||
GtkWidget *frame;
|
||||
GtkWidget *button;
|
||||
GtkWidget *hbox;
|
||||
GtkWidget *label;
|
||||
@@ -283,23 +282,6 @@ button_press_event (GtkWidget *widget,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
set_shadow_type (XedStatusComboBox *combo)
|
||||
{
|
||||
GtkStyleContext *context;
|
||||
GtkShadowType shadow_type;
|
||||
GtkWidget *statusbar;
|
||||
|
||||
/* This is a hack needed to use the shadow type of a statusbar */
|
||||
statusbar = gtk_statusbar_new ();
|
||||
context = gtk_widget_get_style_context (statusbar);
|
||||
|
||||
gtk_style_context_get_style (context, "shadow-type", &shadow_type, NULL);
|
||||
gtk_frame_set_shadow_type (GTK_FRAME (combo->priv->frame), shadow_type);
|
||||
|
||||
gtk_widget_destroy (statusbar);
|
||||
}
|
||||
|
||||
static void
|
||||
xed_status_combo_box_init (XedStatusComboBox *self)
|
||||
{
|
||||
@@ -309,20 +291,14 @@ xed_status_combo_box_init (XedStatusComboBox *self)
|
||||
|
||||
gtk_event_box_set_visible_window (GTK_EVENT_BOX (self), TRUE);
|
||||
|
||||
self->priv->frame = gtk_frame_new (NULL);
|
||||
gtk_widget_show (self->priv->frame);
|
||||
|
||||
self->priv->button = gtk_toggle_button_new ();
|
||||
gtk_button_set_relief (GTK_BUTTON (self->priv->button), GTK_RELIEF_NONE);
|
||||
gtk_widget_show (self->priv->button);
|
||||
|
||||
set_shadow_type (self);
|
||||
|
||||
self->priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
|
||||
gtk_widget_show (self->priv->hbox);
|
||||
|
||||
gtk_container_add (GTK_CONTAINER (self), self->priv->frame);
|
||||
gtk_container_add (GTK_CONTAINER (self->priv->frame), self->priv->button);
|
||||
gtk_container_add (GTK_CONTAINER (self), self->priv->button);
|
||||
gtk_container_add (GTK_CONTAINER (self->priv->button), self->priv->hbox);
|
||||
|
||||
self->priv->label = gtk_label_new ("");
|
||||
@@ -361,10 +337,6 @@ xed_status_combo_box_init (XedStatusComboBox *self)
|
||||
gtk_style_context_add_provider (context,
|
||||
GTK_STYLE_PROVIDER (XED_STATUS_COMBO_BOX_GET_CLASS (self)->priv->css),
|
||||
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
|
||||
context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->frame));
|
||||
gtk_style_context_add_provider (context,
|
||||
GTK_STYLE_PROVIDER (XED_STATUS_COMBO_BOX_GET_CLASS (self)->priv->css),
|
||||
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
|
||||
}
|
||||
|
||||
/* public functions */
|
||||
|
Reference in New Issue
Block a user