diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-08-27 11:45:01 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-08-27 11:45:01 -0400 |
| commit | 0039418001baf82e740c636e1f3ef29850219c44 (patch) | |
| tree | 763b8e65f65085a13cb7f519800cd3ca9a059a31 | |
| parent | c8e8cdaaf49a6fc67d3e5c99cb9a0d266c748584 (diff) | |
| download | gtk+-0039418001baf82e740c636e1f3ef29850219c44.tar.gz | |
GtkToolbar: partial fix for toolbar editing
When using an editable toolbar in evince, we can end up
in gtk_toolbar_get_visible() position with item being the
highlight_tool_item, but not one of the regular children.
So, handle that.
| -rw-r--r-- | gtk/gtktoolbar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index d9f93fc8b4..9bbbe94f5c 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -3896,6 +3896,9 @@ gtk_toolbar_get_visible_position (GtkToolbar *toolbar, { CountingData count = { child, FALSE, 0, 0 }; + if (child == (GtkWidget*)toolbar->priv->highlight_tool_item) + return 0; + /* foreach iterates in visible order */ gtk_container_forall (GTK_CONTAINER (toolbar), count_widget_position, |