Commit c3ee7283 authored by Michael Natterer's avatar Michael Natterer Committed by Michael Natterer

Merged from maemo-gtk:

2007-06-27  Michael Natterer  <mitch@imendio.com>

	Merged from maemo-gtk:

	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): when updating the
	scroll arrows' state, make sure we don't overwrite the insensitive
	state that might have been set by the first scroll step hitting
	the top/bottom border of the menu.


svn path=/trunk/; revision=18260
parent 286567a7
2007-06-27 Michael Natterer <mitch@imendio.com>
Merged from maemo-gtk:
* gtk/gtkmenu.c (gtk_menu_handle_scrolling): when updating the
scroll arrows' state, make sure we don't overwrite the insensitive
state that might have been set by the first scroll step hitting
the top/bottom border of the menu.
Wed Jun 27 13:27:21 2007 Tim Janik <timj@gtk.org>
* gtk/gtkradiobutton.[hc]: applied patch to improve variable names,
......@@ -5,7 +14,8 @@ Wed Jun 27 13:27:21 2007 Tim Janik <timj@gtk.org>
Wed Jun 27 11:57:41 2007 Tim Janik <timj@imendio.com>
* gtk/gtkstatusicon.c (gtk_status_icon_position_menu): fixed push_in description.
* gtk/gtkstatusicon.c (gtk_status_icon_position_menu): fixed
push_in description.
2007-06-27 Johan Dahlin <jdahlin@async.com.br>
......
......@@ -3274,7 +3274,6 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
if (priv->upper_arrow_state != GTK_STATE_INSENSITIVE)
{
gboolean arrow_pressed = FALSE;
GtkStateType arrow_state = GTK_STATE_NORMAL;
if (menu->upper_arrow_visible && !menu->tearoff_active)
{
......@@ -3342,6 +3341,14 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
}
}
/* gtk_menu_start_scrolling() might have hit the top of the
* menu, so check if the button isn't insensitive before
* changing it to something else.
*/
if (priv->upper_arrow_state != GTK_STATE_INSENSITIVE)
{
GtkStateType arrow_state = GTK_STATE_NORMAL;
if (arrow_pressed)
arrow_state = GTK_STATE_ACTIVE;
else if (menu->upper_arrow_prelight)
......@@ -3355,6 +3362,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
&rect, FALSE);
}
}
}
/* lower arrow handling */
......@@ -3374,7 +3382,6 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
if (priv->lower_arrow_state != GTK_STATE_INSENSITIVE)
{
gboolean arrow_pressed = FALSE;
GtkStateType arrow_state = GTK_STATE_NORMAL;
if (menu->lower_arrow_visible && !menu->tearoff_active)
{
......@@ -3442,6 +3449,14 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
}
}
/* gtk_menu_start_scrolling() might have hit the bottom of the
* menu, so check if the button isn't insensitive before
* changing it to something else.
*/
if (priv->lower_arrow_state != GTK_STATE_INSENSITIVE)
{
GtkStateType arrow_state = GTK_STATE_NORMAL;
if (arrow_pressed)
arrow_state = GTK_STATE_ACTIVE;
else if (menu->lower_arrow_prelight)
......@@ -3455,6 +3470,7 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
&rect, FALSE);
}
}
}
}
static gboolean
......
Markdown is supported
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