AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 13:11:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix problem where notebook gap was double shifted by allocation.x/y

Browse Source 
Tue Nov 20 12:37:10 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
	where notebook gap was double shifted by allocation.x/y

	* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
	to unmap children.
This commit is contained in:
Owen Taylor 2001-11-20 17:42:56 +00:00 committed by Owen Taylor
parent 2394977634
commit cbab863627
8 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Tue Nov 20 12:37:10 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_paint): Fix problem
where notebook gap was double shifted by allocation.x/y
* gtk/gtknotebook.c (gtk_notebook_unmap): Chain up
to unmap children.
Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org> Tue Nov 20 14:49:59 2001 Tim Janik <timj@gtk.org>
* gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix * gtk/gtkvpaned.c (gtk_vpaned_size_allocate): fix

12
gtk/gtknotebook.c
View File

@ -834,6 +834,8 @@ gtk_notebook_unmap (GtkWidget *widget)
GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
gdk_window_hide (GTK_NOTEBOOK (widget)->event_window); gdk_window_hide (GTK_NOTEBOOK (widget)->event_window);
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
} }
static void static void
@ -2443,19 +2445,13 @@ gtk_notebook_paint (GtkWidget *widget,
switch (notebook->tab_pos) switch (notebook->tab_pos)
{ {
case GTK_POS_TOP: case GTK_POS_TOP:
gap_x = (notebook->cur_page->allocation.x - border_width);
gap_width = notebook->cur_page->allocation.width;
break;
case GTK_POS_BOTTOM: case GTK_POS_BOTTOM:
gap_x = (notebook->cur_page->allocation.x - border_width); gap_x = (notebook->cur_page->allocation.x - widget->allocation.x - border_width);
gap_width = notebook->cur_page->allocation.width; gap_width = notebook->cur_page->allocation.width;
break; break;
case GTK_POS_LEFT: case GTK_POS_LEFT:
gap_x = (notebook->cur_page->allocation.y - border_width);
gap_width = notebook->cur_page->allocation.height;
break;
case GTK_POS_RIGHT: case GTK_POS_RIGHT:
gap_x = (notebook->cur_page->allocation.y - border_width); gap_x = (notebook->cur_page->allocation.y - widget->allocation.y - border_width);
gap_width = notebook->cur_page->allocation.height; gap_width = notebook->cur_page->allocation.height;
break; break;
} }