diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-11-07 17:28:37 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-11-07 17:28:37 +0000 |
| commit | 4309a349b5fbd21535be270a71f3d4f57da81490 (patch) | |
| tree | 6805ee01575b65111e8762c652dd110a6bb44882 | |
| parent | 7d9be7f94982a59e64f76a321dfd4f7632bf22ba (diff) | |
| download | gtk+-4309a349b5fbd21535be270a71f3d4f57da81490.tar.gz | |
Don't popup the completions if the focus has already been moved somewhere
2005-11-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup):
Don't popup the completions if the focus has already been
moved somewhere else. (#319914, Christian Persch)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkentrycompletion.c | 3 |
3 files changed, 11 insertions, 0 deletions
@@ -1,5 +1,9 @@ 2005-11-07 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentrycompletion.c (_gtk_entry_completion_popup): + Don't popup the completions if the focus has already been + moved somewhere else. (#319914, Christian Persch) + * gtk/gtktoolitem.c (_gtk_tool_item_toolbar_reconfigured): Raise the drag_window after reconfiguring the toolbar. (#320803, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a82a7e8e30..7b859bdd85 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-11-07 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentrycompletion.c (_gtk_entry_completion_popup): + Don't popup the completions if the focus has already been + moved somewhere else. (#319914, Christian Persch) + * gtk/gtktoolitem.c (_gtk_tool_item_toolbar_reconfigured): Raise the drag_window after reconfiguring the toolbar. (#320803, Christian Persch) diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index b5974698d0..73505c8153 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1425,6 +1425,9 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion) if (!GTK_WIDGET_MAPPED (completion->priv->entry)) return; + if (!GTK_WIDGET_HAS_FOCUS (completion->priv->entry)) + return; + completion->priv->ignore_enter = TRUE; column = gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0); |