diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-02-10 02:35:09 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-02-10 02:35:09 +0000 |
| commit | d1bda8d56232ff0431796add4029e129f877fd6a (patch) | |
| tree | 63c722c3ed4b8a886242bc78ae78dae1811c6b3a /gtk/gtkaspectframe.c | |
| parent | 84d9f5f9a13d52cd91bffc6230445d1e0ac73431 (diff) | |
| download | gtk+-d1bda8d56232ff0431796add4029e129f877fd6a.tar.gz | |
Fixed some bugs with set_default_size.
Sun Feb 7 19:49:21 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_move_resize): Fixed some
bugs with set_default_size.
Sat Feb 6 13:23:51 1999 Owen Taylor <otaylor@redhat.com>
* docs/Changes-1.2.txt: Added information about
the change to gtk_widget_size_request().
* gtk/gtkentry.c: Call gtk_widget_get_child_requisition
explicitely since we differentiate between the usize
set by the user and what we got. (Ugh)
* gtk/gtkwidget.[ch] (gtk_widget_get_child_requisition):
New function to return the effective size of a widget
as it looks to its parent.
* gtk/gtkwidget.c (gtk_widget_size_request): Leave
widget->requisition set to exactly what the widget
asked for, and then make a copy of that into
the requisition argument. Allow a NULL requisition
argument, and, if G_ENABLE_DEBUG, warn if
requisition == &widget->requisition.
* gtkalignment.c gtkaspectframe.c gtkbutton.c gtkclist.c
gtkcontainer.c gtkentry.c gtkeventbox.c gtkfixed.c
gtkframe.c gtkhandlebox.c gtkhbox.c gtkhpaned.c
gtklayout.c gtklist.c gtklistitem.c gtkmenu.c
gtkmenubar.c gtkmenuitem.c gtknotebook.c
gtkoptionmenu.c gtkpacker.c gtkscrolledwindow.c
gtktable.c gtktoolbar.c gtktree.c gtktreeitem.c
gtkvbox.c gtkviewport.c gtkvpaned.c gtkwindow.c
Avoid calling gtk_widget_size_request with
requisition == widget->requisition; use
gtk_widget_get_child_requisition to get the
size of children.
Diffstat (limited to 'gtk/gtkaspectframe.c')
| -rw-r--r-- | gtk/gtkaspectframe.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 5ee502266b..9faaeb3a70 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -295,13 +295,16 @@ gtk_aspect_frame_size_allocate (GtkWidget *widget, { if (aspect_frame->obey_child) { - if (bin->child->requisition.height != 0) + GtkRequisition child_requisition; + + gtk_widget_get_child_requisition (bin->child, &child_requisition); + if (child_requisition.height != 0) { - ratio = (gdouble)bin->child->requisition.width / - bin->child->requisition.height; + ratio = (gdouble)child_requisition.width / + child_requisition.height; if (ratio < MIN_RATIO) ratio = MIN_RATIO; } - else if (bin->child->requisition.width != 0) + else if (child_requisition.width != 0) ratio = MAX_RATIO; else ratio = 1.0; |