only take the padding into account if there is an accelerator.

Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
        padding into account if there is an accelerator.
This commit is contained in:
Tim Janik 1998-07-10 08:53:52 +00:00 committed by Tim Janik
parent 55b5e035fc
commit ab3f4a1607
8 changed files with 37 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -1,3 +1,8 @@
Fri Jul 10 09:37:50 1998 Tim Janik <timj@gtk.org>
* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
padding into account if there is an accelerator.
Fri Jul 10 05:51:44 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.c:

View File

@ -211,7 +211,8 @@ gtk_accel_label_accelerator_width (GtkAccelLabel *accel_label)
g_return_val_if_fail (accel_label != NULL, 0);
g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), 0);
return accel_label->accel_padding + accel_label->accel_string_width;
return (accel_label->accel_string_width +
(accel_label->accel_string_width ? accel_label->accel_padding : 0));
}
static void