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

Fix problem where there were two copies of the "do an arrow step" code,

Browse Source 
Thu Mar  7 10:31:57 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
        there were two copies of the "do an arrow step" code,
        one correct for rotated notebooks, one not. (#73855,
        Thomas Leonard.)
This commit is contained in:
Owen Taylor 2002-03-07 15:39:31 +00:00 committed by Owen Taylor
parent 1dad43b946
commit a67723b05d
8 changed files with 74 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Thu Mar 7 10:31:57 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtknotebook.c (gtk_notebook_timer): Fix problem where
there were two copies of the "do an arrow step" code,
one correct for rotated notebooks, one not. (#73855,
Thomas Leonard.)
Wed Mar 6 23:20:51 2002 Jonathan Blandford <jrb@redhat.com>
and Kristian Rietveld <kris@gtk.org>

53
gtk/gtknotebook.c
View File

@ -1449,6 +1449,27 @@ gtk_notebook_get_arrow (GtkNotebook *notebook,
return 0;
}
static void
gtk_notebook_do_arrow (GtkNotebook *notebook,
GtkArrowType arrow)
{
GtkWidget *widget = GTK_WIDGET (notebook);
GtkDirectionType dir;
if (!notebook->focus_tab ||
gtk_notebook_search_page (notebook, notebook->focus_tab,
arrow == GTK_ARROW_LEFT ? STEP_PREV : STEP_NEXT,
TRUE))
{
if (notebook->tab_pos == GTK_POS_LEFT ||
notebook->tab_pos == GTK_POS_RIGHT)
dir = (arrow == GTK_ARROW_LEFT) ? GTK_DIR_UP : GTK_DIR_DOWN;
else
dir = (arrow == GTK_ARROW_LEFT) ? GTK_DIR_LEFT : GTK_DIR_RIGHT;
gtk_widget_child_focus (widget, dir);
}
}
static gboolean
gtk_notebook_arrow_button_press (GtkNotebook *notebook,
GtkArrowType arrow,
@ -1464,19 +1485,7 @@ gtk_notebook_arrow_button_press (GtkNotebook *notebook,
if (event->button == 1)
{
GtkDirectionType dir;
if (!notebook->focus_tab ||
gtk_notebook_search_page (notebook, notebook->focus_tab,
arrow == GTK_ARROW_LEFT ? STEP_PREV : STEP_NEXT,
TRUE))
{
if (notebook->tab_pos == GTK_POS_LEFT ||
notebook->tab_pos == GTK_POS_RIGHT)
dir = (arrow == GTK_ARROW_LEFT) ? GTK_DIR_UP : GTK_DIR_DOWN;
else
dir = (arrow == GTK_ARROW_LEFT) ? GTK_DIR_LEFT : GTK_DIR_RIGHT;
gtk_widget_child_focus (widget, dir);
}
gtk_notebook_do_arrow (notebook, arrow);
if (!notebook->timer)
{
@ -2293,23 +2302,11 @@ gtk_notebook_timer (GtkNotebook *notebook)
gboolean retval = FALSE;
GDK_THREADS_ENTER ();
if (notebook->timer)
{
if (notebook->click_child == GTK_ARROW_LEFT)
{
if (!notebook->focus_tab ||
gtk_notebook_search_page (notebook, notebook->focus_tab,
STEP_PREV, TRUE))
gtk_widget_child_focus (GTK_WIDGET (notebook), GTK_DIR_LEFT);
}
else if (notebook->click_child == GTK_ARROW_RIGHT)
{
if (!notebook->focus_tab ||
gtk_notebook_search_page (notebook, notebook->focus_tab,
STEP_NEXT, TRUE))
gtk_widget_child_focus (GTK_WIDGET (notebook), GTK_DIR_RIGHT);
}
gtk_notebook_do_arrow (notebook, notebook->click_child);
if (notebook->need_timer)
{
notebook->need_timer = FALSE;