diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-05-12 17:07:46 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-05-12 17:07:46 +0000 |
| commit | d2ec6e1b12e8e476edebc9448066d7f3f92e1f96 (patch) | |
| tree | 064bbd9c6ab2242a07b4fc00d28acce021f8c2fe | |
| parent | eb60d23845769a9593d1916bc7a9cdc1db1bc414 (diff) | |
| download | gdm-d2ec6e1b12e8e476edebc9448066d7f3f92e1f96.tar.gz | |
Fix layout of buttons. Patch provided by Erwann Chenede.
2006-05-12 Brian Cameron <brian.cameron@sun.com>
* gui/greeter/greeter_geometry.c: Fix layout of buttons.
Patch provided by Erwann Chenede.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gui/greeter/greeter_geometry.c | 24 |
2 files changed, 15 insertions, 14 deletions
@@ -1,5 +1,10 @@ 2006-05-12 Brian Cameron <brian.cameron@sun.com> + * gui/greeter/greeter_geometry.c: Fix layout of buttons. + Patch provided by Erwann Chenede. + +2006-05-12 Brian Cameron <brian.cameron@sun.com> + * Release 2.15.1: * NEWS: Updated. * docs/C/gdm.xml: Updated to reflect which interfaces are diff --git a/gui/greeter/greeter_geometry.c b/gui/greeter/greeter_geometry.c index 88155ce6..8c810006 100644 --- a/gui/greeter/greeter_geometry.c +++ b/gui/greeter/greeter_geometry.c @@ -563,35 +563,31 @@ greeter_item_size_request (GreeterItemInfo *item, if (item->item_type == GREETER_ITEM_TYPE_BUTTON) { +#define ITEM_BUTTON_MIN_RECOMMANDED_WIDTH_OFFSET 15 +#define ITEM_BUTTON_MIN_RECOMMANDED_HEIGHT_OFFSET 10 PangoLayout *layout; PangoFontDescription *font_desc; int pango_width, pango_height; int pix_width, pix_height; GtkWidget *dummy_w = gtk_button_new (); - - if (strcmp (item->id, "options_button") == 0) - layout = gtk_widget_create_pango_layout (dummy_w, _("Select Language...")); - else - layout = gtk_widget_create_pango_layout (dummy_w, item->data.text.orig_text); + + layout = gtk_widget_create_pango_layout (dummy_w, item->data.text.orig_text); pango_layout_get_size (layout, &pango_width, &pango_height); - pix_height = PANGO_PIXELS (pango_height); - pix_width = PANGO_PIXELS (pango_width); - - if (strcmp (item->id, "options_button") == 0) - pix_width += pix_height * 2; /* add padding for combobox */ + pix_height = PANGO_PIXELS (pango_height) + ITEM_BUTTON_MIN_RECOMMANDED_HEIGHT_OFFSET; + pix_width = PANGO_PIXELS (pango_width) + ITEM_BUTTON_MIN_RECOMMANDED_WIDTH_OFFSET; if (pix_width > item->parent->box_min_width) - req->width = pix_width; + req->width = pix_width; else - req->width = item->parent->box_min_width; + req->width = item->parent->box_min_width; if (pix_height > item->parent->box_min_height) - req->height = pix_height; + req->height = pix_height; else - req->height = item->parent->box_min_height; + req->height = item->parent->box_min_height; } if (req->width > 0 && req->height > 0) |