From ac3e3fd8e26e79f6eb328a517e4f2239f69278b2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 9 Nov 2004 19:49:13 +0000 Subject: [PATCH] Make it work with *big* icon views. (#154466) 2004-11-09 Matthias Clasen * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make it work with *big* icon views. (#154466) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkiconview.c | 7 ++++--- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e18d898f03..0ebca71473 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-11-09 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make + it work with *big* icon views. (#154466) + * tests/testiconview.c: Add a real "Add many" button. * gtk/gtkaction.[hc]: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e18d898f03..0ebca71473 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-11-09 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make + it work with *big* icon views. (#154466) + * tests/testiconview.c: Add a real "Add many" button. * gtk/gtkaction.[hc]: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e18d898f03..0ebca71473 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-11-09 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make + it work with *big* icon views. (#154466) + * tests/testiconview.c: Add a real "Add many" button. * gtk/gtkaction.[hc]: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e18d898f03..0ebca71473 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-11-09 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_scroll_to_item): Make + it work with *big* icon views. (#154466) + * tests/testiconview.c: Add a real "Add many" button. * gtk/gtkaction.[hc]: diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 7421429457..0d9ec1cb96 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -736,7 +736,7 @@ gtk_icon_view_realize (GtkWidget *widget) gtk_widget_get_events (widget); icon_view->priv->bin_window = gdk_window_new (widget->window, - &attributes, attributes_mask); + &attributes, attributes_mask); gdk_window_set_user_data (icon_view->priv->bin_window, widget); widget->style = gtk_style_attach (widget->style, widget->window); @@ -2772,7 +2772,8 @@ gtk_icon_view_scroll_to_item (GtkIconView *icon_view, gint y, height; gdouble value; - gdk_window_get_geometry (icon_view->priv->bin_window, NULL, &y, NULL, &height, NULL); + gdk_drawable_get_size (GDK_DRAWABLE (icon_view->priv->bin_window), NULL, &height); + gdk_window_get_position (icon_view->priv->bin_window, NULL, &y); if (y + item->y < 0) { @@ -3282,7 +3283,7 @@ gtk_icon_view_unselect_path (GtkIconView *icon_view, * gtk_icon_view_get_selected_items: * @icon_view: A #GtkIconView. * - * Creates a list of path of all selected items. Additionally, if you are + * Creates a list of paths of all selected items. Additionally, if you are * planning on modifying the model after calling this function, you may * want to convert the returned list into a list of #GtkTreeRowReferences. * To do this, you can use gtk_tree_row_reference_new().