From 2134d4a1fc6282b22236c66a4529395f895ed4bc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 7 Mar 2006 11:49:51 +0000 Subject: Add patch for the treeview in scrollview bug in 2.8 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@296 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../gtk+/gtk+-2.8.9/gtktreeview-316689.patch | 25 ++++++++++++++++++++++ openembedded/packages/gtk+/gtk+_2.8.9.bb | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 openembedded/packages/gtk+/gtk+-2.8.9/gtktreeview-316689.patch (limited to 'openembedded/packages/gtk+') diff --git a/openembedded/packages/gtk+/gtk+-2.8.9/gtktreeview-316689.patch b/openembedded/packages/gtk+/gtk+-2.8.9/gtktreeview-316689.patch new file mode 100644 index 000000000..4e77ddf9f --- /dev/null +++ b/openembedded/packages/gtk+/gtk+-2.8.9/gtktreeview-316689.patch @@ -0,0 +1,25 @@ +diff -u -p -r1.498 gtktreeview.c +--- gtk+-2.8.9/gtk/gtktreeview.c 22 Oct 2005 21:08:23 -0000 1.498 ++++ gtk+-2.8.9/gtk/gtktreeview.c 24 Oct 2005 22:30:27 -0000 +@@ -2098,6 +2098,9 @@ gtk_tree_view_size_allocate (GtkWidget + /* now the adjustments and window sizes are in sync, we can sync toprow/dy again */ + if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size) + gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0); ++ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height) ++ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), ++ tree_view->priv->height - tree_view->priv->vadjustment->page_size); + else if (gtk_tree_row_reference_valid (tree_view->priv->top_row)) + gtk_tree_view_top_row_to_dy (tree_view); + else +@ -5031,6 +5034,11 @@ validate_visible_area (GtkTreeView *tree + * else than zero. we update top_row to be in sync with dy = 0. + */ + gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0); ++ gtk_tree_view_dy_to_top_row (tree_view); ++ } ++ else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height) ++ { ++ gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - tree_view->priv->vadjustment->page_size); + gtk_tree_view_dy_to_top_row (tree_view); + } + else diff --git a/openembedded/packages/gtk+/gtk+_2.8.9.bb b/openembedded/packages/gtk+/gtk+_2.8.9.bb index d1c42082d..7268d74f3 100644 --- a/openembedded/packages/gtk+/gtk+_2.8.9.bb +++ b/openembedded/packages/gtk+/gtk+_2.8.9.bb @@ -6,7 +6,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell " DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt cairo" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -15,6 +15,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://hardcoded_libtool.patch;patch=1 \ file://disable-tooltips.patch;patch=1 \ file://gtklabel-resize-patch;patch=1 \ + file://gtktreeview-316689.patch;patch=1 \ file://treeviewfix.patch;patch=1" # file://menu-deactivate.patch;patch=1 \ # file://xsettings.patch;patch=1 \ -- cgit v1.2.3