[maemo-commits] [maemo-commits] r9849 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-14 14:15:43 +0200 (Wed, 14 Feb 2007)
New Revision: 9849

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c
Log:
2007-02-14  Kristian Rietveld  <kris at imendio.com>

	Merge from upstream trunk:

	* gtk/gtktreeviewcolum.c (_gtk_tree_view_column_realize_button):
	use TREE_VIEW_DRAG_WIDTH/2 when calculating the drag window
	position instead of a hardcoded value.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 12:10:57 UTC (rev 9848)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 12:15:43 UTC (rev 9849)
@@ -1,3 +1,11 @@
+2007-02-14  Kristian Rietveld  <kris at imendio.com>
+
+	Merge from upstream trunk:
+
+	* gtk/gtktreeviewcolum.c (_gtk_tree_view_column_realize_button):
+	use TREE_VIEW_DRAG_WIDTH/2 when calculating the drag window
+	position instead of a hardcoded value.
+
 2007-02-14  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenu.c (gtk_menu_motion_notify): don't forget to set the

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c	2007-02-14 12:10:57 UTC (rev 9848)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeviewcolumn.c	2007-02-14 12:15:43 UTC (rev 9849)
@@ -1271,7 +1271,7 @@
   attr.width = TREE_VIEW_DRAG_WIDTH;
   attr.height = tree_view->priv->header_height;
 
-  attr.x = (column->button->allocation.x + (rtl ? 0 : column->button->allocation.width)) - 3;
+  attr.x = (column->button->allocation.x + (rtl ? 0 : column->button->allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2;
   column->window = gdk_window_new (tree_view->priv->header_window,
 				   &attr, attributes_mask);
   gdk_window_set_user_data (column->window, tree_view);