AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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).
This commit is contained in:
Tim Janik 1999-02-25 14:08:50 +00:00 committed by Tim Janik
parent 473e31208e
commit 2a4c97f3b3
8 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

7
ChangeLog.pre-2-0
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

7
ChangeLog.pre-2-10
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

7
ChangeLog.pre-2-2
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

7
ChangeLog.pre-2-4
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

7
ChangeLog.pre-2-6
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

7
ChangeLog.pre-2-8
View File

@ -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> Thu Feb 25 11:27:36 1999 Tim Janik <timj@gtk.org>
* TODO: updates, i left the text widget related portions in there, * TODO: updates, i left the text widget related portions in there,

8
gtk/gtkscrolledwindow.c
View File

@ -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)) GTK_WIDGET_VISIBLE (scrolled_window->hscrollbar))
{ {
requisition->width = MAX (requisition->width, hscrollbar_requisition.width); 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; 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)) GTK_WIDGET_VISIBLE (scrolled_window->vscrollbar))
{ {
requisition->height = MAX (requisition->height, vscrollbar_requisition.height); 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; extra_width = SCROLLBAR_SPACING (scrolled_window) + vscrollbar_requisition.width;
} }