diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-06-12 11:17:16 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-06-12 11:17:16 +0000 |
| commit | dcfefba203d08e835e4722a4adbbf6c995295203 (patch) | |
| tree | b5d506de2c998466aafd2166b0256382cc8c7eab /gtk/gtkentrycompletion.c | |
| parent | d76e3d552e4b991cd3739cf3496884e66d77548e (diff) | |
| download | gtk+-dcfefba203d08e835e4722a4adbbf6c995295203.tar.gz | |
limit the number of displayed items by the actual screen height instead of
2008-06-12 Michael Natterer <mitch@imendio.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
limit the number of displayed items by the actual screen height
instead of some arbitrary value (Bug #408154, Xan Lopez and
Christian Dywan).
svn path=/trunk/; revision=20359
Diffstat (limited to 'gtk/gtkentrycompletion.c')
| -rw-r--r-- | gtk/gtkentrycompletion.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 2fc582ecdf..d526a51490 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1383,8 +1383,6 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) matches = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (completion->priv->filter_model), NULL); - items = MIN (matches, 15); - gtk_tree_view_column_cell_get_size (completion->priv->column, NULL, NULL, NULL, NULL, &height); @@ -1396,16 +1394,23 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) gtk_widget_realize (completion->priv->tree_view); - if (items <= 0) - gtk_widget_hide (completion->priv->scrolled_window); - else - gtk_widget_show (completion->priv->scrolled_window); - screen = gtk_widget_get_screen (GTK_WIDGET (completion->priv->entry)); monitor_num = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (completion->priv->entry)->window); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + + + if (y > monitor.height / 2) + items = MIN (matches, (monitor.y + y) / height); + else + items = MIN (matches, (monitor.height - y) / height - 1); + + if (items <= 0) + gtk_widget_hide (completion->priv->scrolled_window); + else + gtk_widget_show (completion->priv->scrolled_window); + if (completion->priv->popup_set_width) width = MIN (completion->priv->entry->allocation.width, monitor.width) - 2 * x_border; else |