From 489d586f1fe56c0b9cbb66a5238e3775563180c9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Oct 2004 19:10:29 +0000 Subject: [PATCH] Don't force the height of the action area, we don't scroll it anyway, and 2004-10-31 Matthias Clasen * 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) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkentrycompletion.c | 14 ++++---------- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 765a7bb846..81a75c176a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-10-31 Matthias Clasen + * 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) + * tests/testentrycompletion.c (animation_timer): Don't try to remove stuff from an empty model. (#156575, Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 765a7bb846..81a75c176a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-10-31 Matthias Clasen + * 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) + * tests/testentrycompletion.c (animation_timer): Don't try to remove stuff from an empty model. (#156575, Christian Persch) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 765a7bb846..81a75c176a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-10-31 Matthias Clasen + * 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) + * tests/testentrycompletion.c (animation_timer): Don't try to remove stuff from an empty model. (#156575, Christian Persch) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 765a7bb846..81a75c176a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-10-31 Matthias Clasen + * 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) + * tests/testentrycompletion.c (animation_timer): Don't try to remove stuff from an empty model. (#156575, Christian Persch) 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);