diff --git a/ChangeLog b/ChangeLog index 461cdc2461..18a4f224be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 461cdc2461..18a4f224be 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 461cdc2461..18a4f224be 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 461cdc2461..18a4f224be 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 461cdc2461..18a4f224be 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 461cdc2461..18a4f224be 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 461cdc2461..18a4f224be 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri May 1 22:45:55 1998 Owen Taylor + + * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate): + Always show the scrollbars when the policy is + GTK_POLICY_ALWAYS... + Sat May 2 20:19:03 1998 Tim Janik * gtk/gtkadjustment.c (gtk_adjustment_set_value): only emit diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 979b166bd3..f3f1ceb2a1 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -382,6 +382,11 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, gtk_container_disable_resize (GTK_CONTAINER (scrolled_window)); + if (scrolled_window->hscrollbar_policy == GTK_POLICY_ALWAYS) + scrolled_window->hscrollbar_visible = TRUE; + if (scrolled_window->vscrollbar_policy == GTK_POLICY_ALWAYS) + scrolled_window->vscrollbar_visible = TRUE; + if (GTK_WIDGET_VISIBLE (scrolled_window->viewport)) { count = 0;