Commit 2a4c97f3 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik
Browse files

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).
parent 473e3120
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,
......
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,
......
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,
......
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,
......
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,
......
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,
......
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,
......
......@@ -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;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment