diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtkentry.c | 14 |
6 files changed, 24 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2004-04-21 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the + completion window if there are no completions anymore. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Don't call gtk_tree_view_scroll_to_cell() on an empty tree view. It doesn't like that. (#140642, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbe27c0f65..f72369a377 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-04-21 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the + completion window if there are no completions anymore. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Don't call gtk_tree_view_scroll_to_cell() on an empty tree view. It doesn't like that. (#140642, Christian Persch) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bbe27c0f65..f72369a377 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2004-04-21 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the + completion window if there are no completions anymore. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Don't call gtk_tree_view_scroll_to_cell() on an empty tree view. It doesn't like that. (#140642, Christian Persch) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bbe27c0f65..f72369a377 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-04-21 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the + completion window if there are no completions anymore. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Don't call gtk_tree_view_scroll_to_cell() on an empty tree view. It doesn't like that. (#140642, Christian Persch) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbe27c0f65..f72369a377 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-04-21 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkentry.c (gtk_entry_completion_timeout): Pop down the + completion window if there are no completions anymore. + * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): Don't call gtk_tree_view_scroll_to_cell() on an empty tree view. It doesn't like that. (#140642, Christian Persch) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 05d37711a8..86d4a0f101 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -4650,11 +4650,15 @@ gtk_entry_completion_timeout (gpointer data) actions = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (completion->priv->actions), NULL); - if ((matches > 0 || actions > 0) - && ! GTK_WIDGET_VISIBLE (completion->priv->popup_window)) - _gtk_entry_completion_popup (completion); - else if (GTK_WIDGET_VISIBLE (completion->priv->popup_window)) - _gtk_entry_completion_resize_popup (completion); + if (matches > 0 || actions > 0) + { + if (GTK_WIDGET_VISIBLE (completion->priv->popup_window)) + _gtk_entry_completion_resize_popup (completion); + else + _gtk_entry_completion_popup (completion); + } + else + _gtk_entry_completion_popdown (completion); } else if (GTK_WIDGET_VISIBLE (completion->priv->popup_window)) _gtk_entry_completion_popdown (completion); |