callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle the case where the first page isn't visible. (#90336, bug tracked

Browse Source 
Fri Sep 27 16:15:11 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
        Handle the case where the first page isn't visible.
        (#90336, bug tracked down by Chema Celorio)
This commit is contained in:
Owen Taylor 2002-09-27 20:19:16 +00:00 committed by Owen Taylor
parent 6d915693c7
commit 8be3514f74
7 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Sep 27 16:15:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
Handle the case where the first page isn't visible.
(#90336, bug tracked down by Chema Celorio)
Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com> Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstock.c (builtin_items): Change accelerator * gtk/gtkstock.c (builtin_items): Change accelerator

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Fri Sep 27 16:15:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
Handle the case where the first page isn't visible.
(#90336, bug tracked down by Chema Celorio)
Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com> Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstock.c (builtin_items): Change accelerator * gtk/gtkstock.c (builtin_items): Change accelerator

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Fri Sep 27 16:15:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
Handle the case where the first page isn't visible.
(#90336, bug tracked down by Chema Celorio)
Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com> Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstock.c (builtin_items): Change accelerator * gtk/gtkstock.c (builtin_items): Change accelerator

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Fri Sep 27 16:15:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
Handle the case where the first page isn't visible.
(#90336, bug tracked down by Chema Celorio)
Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com> Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstock.c (builtin_items): Change accelerator * gtk/gtkstock.c (builtin_items): Change accelerator

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Fri Sep 27 16:15:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
Handle the case where the first page isn't visible.
(#90336, bug tracked down by Chema Celorio)
Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com> Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstock.c (builtin_items): Change accelerator * gtk/gtkstock.c (builtin_items): Change accelerator

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Fri Sep 27 16:15:11 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_get_event_window_position):
Handle the case where the first page isn't visible.
(#90336, bug tracked down by Chema Celorio)
Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com> Fri Sep 27 15:57:15 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkstock.c (builtin_items): Change accelerator * gtk/gtkstock.c (builtin_items): Change accelerator

20
gtk/gtknotebook.c
View File

@ -864,13 +864,23 @@ gtk_notebook_get_event_window_position (GtkNotebook *notebook,
{ {
GtkWidget *widget = GTK_WIDGET (notebook); GtkWidget *widget = GTK_WIDGET (notebook);
gint border_width = GTK_CONTAINER (notebook)->border_width; gint border_width = GTK_CONTAINER (notebook)->border_width;
GtkNotebookPage *visible_page = NULL;
GList *tmp_list;
if (notebook->show_tabs && notebook->children) for (tmp_list = notebook->children; tmp_list; tmp_list = tmp_list->next)
{
GtkNotebookPage *page = tmp_list->data;
if (GTK_WIDGET_VISIBLE (page->child))
{
visible_page = page;
break;
}
}
if (notebook->show_tabs && visible_page)
{ {
if (rectangle) if (rectangle)
{ {
GtkNotebookPage *page = notebook->children->data;
rectangle->x = widget->allocation.x + border_width; rectangle->x = widget->allocation.x + border_width;
rectangle->y = widget->allocation.y + border_width; rectangle->y = widget->allocation.y + border_width;
@ -879,13 +889,13 @@ gtk_notebook_get_event_window_position (GtkNotebook *notebook,
case GTK_POS_TOP: case GTK_POS_TOP:
case GTK_POS_BOTTOM: case GTK_POS_BOTTOM:
rectangle->width = widget->allocation.width - 2 * border_width; rectangle->width = widget->allocation.width - 2 * border_width;
rectangle->height = page->requisition.height; rectangle->height = visible_page->requisition.height;
if (notebook->tab_pos == GTK_POS_BOTTOM) if (notebook->tab_pos == GTK_POS_BOTTOM)
rectangle->y += widget->allocation.height - 2 * border_width - rectangle->height; rectangle->y += widget->allocation.height - 2 * border_width - rectangle->height;
break; break;
case GTK_POS_LEFT: case GTK_POS_LEFT:
case GTK_POS_RIGHT: case GTK_POS_RIGHT:
rectangle->width = page->requisition.width; rectangle->width = visible_page->requisition.width;
rectangle->height = widget->allocation.height - 2 * border_width; rectangle->height = widget->allocation.height - 2 * border_width;
if (notebook->tab_pos == GTK_POS_RIGHT) if (notebook->tab_pos == GTK_POS_RIGHT)
rectangle->x += widget->allocation.width - 2 * border_width - rectangle->width; rectangle->x += widget->allocation.width - 2 * border_width - rectangle->width;