diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2000-03-14 19:57:25 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-03-14 19:57:25 +0000 |
| commit | 10ba4fd066042b4335ae45e7560565872f71ba9b (patch) | |
| tree | 17f68ffb0d402b6e66bb891d4a7d9a02a9b6108b /gtk/gtkscrolledwindow.c | |
| parent | 3f98a849c70ae570b78095cef0152a33ec07c64e (diff) | |
| download | gdk-pixbuf-10ba4fd066042b4335ae45e7560565872f71ba9b.tar.gz | |
Merges from gtk-1-2
Diffstat (limited to 'gtk/gtkscrolledwindow.c')
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 2e7b96924..a4529521f 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -656,18 +656,18 @@ gtk_scrolled_window_size_request (GtkWidget *widget, } if (scrolled_window->hscrollbar_policy == GTK_POLICY_AUTOMATIC || - GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar)) + scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS) { requisition->width = MAX (requisition->width, hscrollbar_requisition.width); - if (!extra_height || GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar)) + if (!extra_height || scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS) extra_height = SCROLLBAR_SPACING (scrolled_window) + hscrollbar_requisition.height; } if (scrolled_window->vscrollbar_policy == GTK_POLICY_AUTOMATIC || - GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar)) + scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS) { requisition->height = MAX (requisition->height, vscrollbar_requisition.height); - if (!extra_width || GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar)) + if (!extra_height || scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS) extra_width = SCROLLBAR_SPACING (scrolled_window) + vscrollbar_requisition.width; } |