diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-10-31 19:10:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-10-31 19:10:29 +0000 |
| commit | 489d586f1fe56c0b9cbb66a5238e3775563180c9 (patch) | |
| tree | 1dbe5137841dda0071af30ec6e80cda498e70195 /gtk/gtkentrycompletion.c | |
| parent | d9f91432c9e5d850332abdad0c6b427e8cd25903 (diff) | |
| download | gtk+-489d586f1fe56c0b9cbb66a5238e3775563180c9.tar.gz | |
Don't force the height of the action area, we don't scroll it anyway, and
2004-10-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
Don't force the height of the action area, we don't scroll
it anyway, and the current way of calculating the height can lead
to broken display. (#156573, Christian Persch)
Diffstat (limited to 'gtk/gtkentrycompletion.c')
| -rw-r--r-- | gtk/gtkentrycompletion.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index fabd61caed..dfc72de15d 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -1284,6 +1284,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) gtk_tree_view_column_cell_get_size (completion->priv->column, NULL, NULL, NULL, NULL, &height); + g_print ("item height %d\n", height); if (items <= 0) gtk_widget_hide (completion->priv->scrolled_window); else @@ -1294,9 +1295,8 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) GTK_WIDGET (completion->priv->entry)->window); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - width = MIN (completion->priv->entry->allocation.width, monitor.width); - gtk_widget_set_size_request (completion->priv->tree_view, - width - 2 * x_border, items * height); + width = MIN (completion->priv->entry->allocation.width, monitor.width) - 2 * x_border; + gtk_widget_set_size_request (completion->priv->tree_view, width, items * height); /* default on no match */ completion->priv->current_selected = -1; @@ -1306,13 +1306,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion) if (items) { gtk_widget_show (completion->priv->action_view); - - gtk_tree_view_column_cell_get_size (gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0), - NULL, NULL, NULL, NULL, - &height); - - gtk_widget_set_size_request (completion->priv->action_view, - width - 2 * x_border, items * height); + gtk_widget_set_size_request (completion->priv->action_view, width, -1); } else gtk_widget_hide (completion->priv->action_view); |