diff options
| author | Carsten Haitzler <raster@src.gnome.org> | 1998-07-03 20:33:16 +0000 |
|---|---|---|
| committer | Carsten Haitzler <raster@src.gnome.org> | 1998-07-03 20:33:16 +0000 |
| commit | 4389781ea1ec28ddcfc7a2c7f543ce7405d34f31 (patch) | |
| tree | 924b41dff9752c6dd7f91fdea0e5b4f51135c302 /gtk/gtkbutton.c | |
| parent | 0da6bdc3304d7fcd0d37e04a117804b229990d1f (diff) | |
| download | gtk+-themes.tar.gz | |
Wheee now others can get to play :)themes
Wheee now others can get to play :)
Diffstat (limited to 'gtk/gtkbutton.c')
| -rw-r--r-- | gtk/gtkbutton.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 189b38831e..4d8f79c23f 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -388,6 +388,8 @@ gtk_button_size_request (GtkWidget *widget, button->border(GTK_WIDGET(widget)); else { + GTK_CONTAINER(widget)->minimum_width=0; + GTK_CONTAINER(widget)->minimum_height=0; if (GTK_WIDGET_CAN_DEFAULT (widget)) { GTK_CONTAINER(widget)->internal_border_left=10; @@ -418,6 +420,14 @@ gtk_button_size_request (GtkWidget *widget, requisition->width += button->child->requisition.width; requisition->height += button->child->requisition.height; } + if ((requisition->width-(GTK_CONTAINER (widget)->border_width * 2))< + GTK_CONTAINER(widget)->minimum_width) + requisition->width=GTK_CONTAINER(widget)->minimum_width+ + (GTK_CONTAINER (widget)->border_width * 2); + if ((requisition->height-(GTK_CONTAINER (widget)->border_width * 2))< + GTK_CONTAINER(widget)->minimum_height) + requisition->height=GTK_CONTAINER(widget)->minimum_height+ + (GTK_CONTAINER (widget)->border_width * 2); } static void |