diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-01 15:50:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-01 15:50:03 +0000 |
| commit | 7ae937e418605c9c8ce7c868e1e84f56901d9346 (patch) | |
| tree | bef87a190cf8adc739a65c76e46f2d0135e1564a | |
| parent | d6eb5c544d73e4436a5014f2cf45deba8c6678e3 (diff) | |
| download | gdk-pixbuf-7ae937e418605c9c8ce7c868e1e84f56901d9346.tar.gz | |
Fix prelighting. (#157392, Vincent Noel, patch by Christian Persch)
2005-03-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenutoolbutton.c (button_state_changed_cb):
Fix prelighting. (#157392, Vincent Noel, patch by
Christian Persch)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/gtkmenutoolbutton.c | 8 |
4 files changed, 19 insertions, 1 deletions
@@ -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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2c21d7af7..12d31b40e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2c21d7af7..12d31b40e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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) diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index f7249f13d..6448d6e15 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -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); |