Fix prelighting. (#157392, Vincent Noel, patch by Christian Persch)

* gtk/gtkmenutoolbutton.c (button_state_changed_cb):
	Fix prelighting.  (#157392, Vincent Noel, patch by
	Christian Persch)
This commit is contained in:
Matthias Clasen 2005-03-01 16:07:04 +00:00
parent 86db923391
commit af58a0dbd8
4 changed files with 19 additions and 1 deletions

View File

@ -1,5 +1,9 @@
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb):
Fix prelighting. (#157392, Vincent Noel, patch by
Christian Persch)
* gtk/gtkicontheme.c (theme_lookup_icon): Make
icon data caching work again. (#168851, Alexander Larsson)

View File

@ -1,5 +1,9 @@
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb):
Fix prelighting. (#157392, Vincent Noel, patch by
Christian Persch)
* gtk/gtkicontheme.c (theme_lookup_icon): Make
icon data caching work again. (#168851, Alexander Larsson)

View File

@ -1,5 +1,9 @@
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb):
Fix prelighting. (#157392, Vincent Noel, patch by
Christian Persch)
* gtk/gtkicontheme.c (theme_lookup_icon): Make
icon data caching work again. (#168851, Alexander Larsson)

View File

@ -277,11 +277,17 @@ button_state_changed_cb (GtkWidget *widget,
{
gtk_widget_set_state (other, state);
}
else if (state == GTK_STATE_ACTIVE)
else if (state == GTK_STATE_ACTIVE ||
(state == GTK_STATE_INSENSITIVE && other == priv->arrow_button))
{
gtk_widget_set_state (other, GTK_STATE_NORMAL);
}
if (state == GTK_STATE_INSENSITIVE && other == priv->arrow_button && button->priv->menu)
{
gtk_menu_shell_deactivate (GTK_MENU_SHELL (button->priv->menu));
}
g_signal_handlers_unblock_by_func (other,
G_CALLBACK (button_state_changed_cb),
button);