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

modelbutton: Create accel label on demand

Browse Source
This commit is contained in:
Timm Bäder 2019-09-28 10:03:08 +02:00
parent a6f14555d1
commit a743412c58
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkmodelbutton.c
View File

@ -547,7 +547,7 @@ gtk_model_button_set_popover (GtkModelButton *button,
} }
static void static void
update_accel (GtkModelButton *button, update_accel (GtkModelButton *self,
const char *accel) const char *accel)
{ {
if (accel) if (accel)
@ -557,19 +557,25 @@ update_accel (GtkModelButton *button,
GtkAccelLabelClass *accel_class; GtkAccelLabelClass *accel_class;
char *str; char *str;
if (!self->accel_label)
{
self->accel_label = g_object_new (GTK_TYPE_LABEL,
"css-name", "accelerator",
NULL);
gtk_widget_insert_before (self->accel_label, GTK_WIDGET (self), NULL);
}
gtk_accelerator_parse (accel, &key, &mods); gtk_accelerator_parse (accel, &key, &mods);
accel_class = g_type_class_ref (GTK_TYPE_ACCEL_LABEL); accel_class = g_type_class_ref (GTK_TYPE_ACCEL_LABEL);
str = _gtk_accel_label_class_get_accelerator_label (accel_class, key, mods); str = _gtk_accel_label_class_get_accelerator_label (accel_class, key, mods);
gtk_label_set_label (GTK_LABEL (button->accel_label), str); gtk_label_set_label (GTK_LABEL (self->accel_label), str);
g_free (str); g_free (str);
g_type_class_unref (accel_class); g_type_class_unref (accel_class);
gtk_widget_show (button->accel_label);
} }
else else
{ {
gtk_widget_hide (button->accel_label); g_clear_pointer (&self->accel_label, gtk_widget_unparent);
} }
} }
@ -1361,16 +1367,9 @@ gtk_model_button_init (GtkModelButton *button)
gtk_widget_hide (button->image); gtk_widget_hide (button->image);
button->label = gtk_label_new (""); button->label = gtk_label_new ("");
gtk_widget_hide (button->label); gtk_widget_hide (button->label);
button->accel_label = g_object_new (GTK_TYPE_LABEL,
"css-name", "accelerator",
NULL);
gtk_widget_set_hexpand (button->accel_label, TRUE);
gtk_label_set_xalign (GTK_LABEL (button->accel_label), 0.0f);
gtk_widget_set_halign (button->accel_label, GTK_ALIGN_END);
gtk_widget_hide (button->accel_label);
gtk_container_add (GTK_CONTAINER (button->box), button->image); gtk_container_add (GTK_CONTAINER (button->box), button->image);
gtk_container_add (GTK_CONTAINER (button->box), button->label); gtk_container_add (GTK_CONTAINER (button->box), button->label);
gtk_container_add (GTK_CONTAINER (button->box), button->accel_label);
gtk_container_add (GTK_CONTAINER (button), button->box); gtk_container_add (GTK_CONTAINER (button), button->box);
button->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); button->start_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);