still request the extra width or height if the corresponding scrollbar is

Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>

        * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
        request the extra width or height if the corresponding scrollbar is
        already visible (the change from 09:50 needs to apply to policy ==
        GTK_POLICY_AUTOMATIC only).

diff --git a/ChangeLog b/ChangeLog
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f35f030de5c907222a13e25bee6eb7d957b9f75e..a4526722a9aa020fc7315bb31bac22060e13a7d9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Feb 25 13:38:38 1999  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request): still
+       request the extra width or height if the corresponding scrollbar is
+       already visible (the change from 09:50 needs to apply to policy ==
+       GTK_POLICY_AUTOMATIC only).
+
 Thu Feb 25 11:27:36 1999  Tim Janik  <timj@gtk.org>
 
        * TODO: updates, i left the text widget related portions in there,

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index f230be53f976605ea60defc48f524d6f046c0db0..c77cb3f63081f6a2a2e28c41819f6d4bd1e5d061 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -652,19 +652,19 @@ gtk_scrolled_window_size_request (GtkWidget      *widget,
        }
     }
 
-  if ((scrolled_window->hscrollbar_policy == GTK_POLICY_AUTOMATIC) ||
+  if (scrolled_window->hscrollbar_policy == GTK_POLICY_AUTOMATIC ||
       GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
     {
       requisition->width = MAX (requisition->width, hscrollbar_requisition.width);
-      if (!extra_height)
+      if (!extra_height || GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
        extra_height = SCROLLBAR_SPACING (scrolled_window) + hscrollbar_requisition.height;
     }
 
-  if ((scrolled_window->vscrollbar_policy == GTK_POLICY_AUTOMATIC) ||
+  if (scrolled_window->vscrollbar_policy == GTK_POLICY_AUTOMATIC ||
       GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
     {
       requisition->height = MAX (requisition->height, vscrollbar_requisition.height);
-      if (!extra_width)
+      if (!extra_width || GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
        extra_width = SCROLLBAR_SPACING (scrolled_window) + vscrollbar_requisition.width;
     }