Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>

* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
	ever make the scrolled-window requisition ever depend on the
	visibility state of the scrollbars for the AUTOMATIC policy.
	This breaks the	GTK+ requisition model, and causes loops.
This commit is contained in:
Owen Taylor
2000-02-03 23:45:12 +00:00
parent ed581c7530
commit 5aa2275d8b
8 changed files with 53 additions and 4 deletions

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -1,3 +1,10 @@
Fri Feb 4 15:54:54 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): Don't
ever make the scrolled-window requisition ever depend on the
visibility state of the scrollbars for the AUTOMATIC policy.
This breaks the GTK+ requisition model, and causes loops.
Fri Feb 4 15:09:12 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstyle.c (gtk_style_new): Set the charset explicitely for

View File

@@ -653,18 +653,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;
}