Commit 97ddec66 authored by Kristian Rietveld's avatar Kristian Rietveld Committed by Kristian Rietveld

Merged from stable.

Sat Jul 12 15:51:18 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): use
	gdk_window_get_pointer instead of gdk_display_get_window_at_pointer
	to avoid a roundtrip (#110272, Owen Taylor).
parent e680d2f5
Sat Jul 12 15:51:18 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): use
gdk_window_get_pointer instead of gdk_display_get_window_at_pointer
to avoid a roundtrip (#110272, Owen Taylor).
Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.
...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> ...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
testcase provided by Timo Sirainen, #111500, testcase provided by testcase provided by Timo Sirainen, #111500, testcase provided by
manu, #113241, reported by Pedro Gimeno/Michael Natterer. manu, #113241, reported by Pedro Gimeno/Michael Natterer.
* gtk/gtktreeview.c (validate_visible_area): scrolling to a dy * gtk/gtktreeview.c (validate_visible_area): scrolling to a dy
which is equal to the lower border of the window means scrolling which is equal to the lower border of the window means scrolling
to an invisible row, always update the dy when scrolling to an to an invisible row, always update the dy when scrolling to an
invisible row, corrected area_above/below calculations for invisible row, corrected area_above/below calculations for
......
Sat Jul 12 15:51:18 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): use
gdk_window_get_pointer instead of gdk_display_get_window_at_pointer
to avoid a roundtrip (#110272, Owen Taylor).
Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.
...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> ...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
testcase provided by Timo Sirainen, #111500, testcase provided by testcase provided by Timo Sirainen, #111500, testcase provided by
manu, #113241, reported by Pedro Gimeno/Michael Natterer. manu, #113241, reported by Pedro Gimeno/Michael Natterer.
* gtk/gtktreeview.c (validate_visible_area): scrolling to a dy * gtk/gtktreeview.c (validate_visible_area): scrolling to a dy
which is equal to the lower border of the window means scrolling which is equal to the lower border of the window means scrolling
to an invisible row, always update the dy when scrolling to an to an invisible row, always update the dy when scrolling to an
invisible row, corrected area_above/below calculations for invisible row, corrected area_above/below calculations for
......
Sat Jul 12 15:51:18 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): use
gdk_window_get_pointer instead of gdk_display_get_window_at_pointer
to avoid a roundtrip (#110272, Owen Taylor).
Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.
...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> ...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
testcase provided by Timo Sirainen, #111500, testcase provided by testcase provided by Timo Sirainen, #111500, testcase provided by
manu, #113241, reported by Pedro Gimeno/Michael Natterer. manu, #113241, reported by Pedro Gimeno/Michael Natterer.
* gtk/gtktreeview.c (validate_visible_area): scrolling to a dy * gtk/gtktreeview.c (validate_visible_area): scrolling to a dy
which is equal to the lower border of the window means scrolling which is equal to the lower border of the window means scrolling
to an invisible row, always update the dy when scrolling to an to an invisible row, always update the dy when scrolling to an
invisible row, corrected area_above/below calculations for invisible row, corrected area_above/below calculations for
......
Sat Jul 12 15:51:18 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): use
gdk_window_get_pointer instead of gdk_display_get_window_at_pointer
to avoid a roundtrip (#110272, Owen Taylor).
Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.
...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> ...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
testcase provided by Timo Sirainen, #111500, testcase provided by testcase provided by Timo Sirainen, #111500, testcase provided by
manu, #113241, reported by Pedro Gimeno/Michael Natterer. manu, #113241, reported by Pedro Gimeno/Michael Natterer.
* gtk/gtktreeview.c (validate_visible_area): scrolling to a dy * gtk/gtktreeview.c (validate_visible_area): scrolling to a dy
which is equal to the lower border of the window means scrolling which is equal to the lower border of the window means scrolling
to an invisible row, always update the dy when scrolling to an to an invisible row, always update the dy when scrolling to an
invisible row, corrected area_above/below calculations for invisible row, corrected area_above/below calculations for
......
Sat Jul 12 15:51:18 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): use
gdk_window_get_pointer instead of gdk_display_get_window_at_pointer
to avoid a roundtrip (#110272, Owen Taylor).
Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable. Merged from stable.
...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org> ...@@ -6,7 +14,7 @@ Sat Jul 12 15:28:26 2003 Kristian Rietveld <kris@gtk.org>
testcase provided by Timo Sirainen, #111500, testcase provided by testcase provided by Timo Sirainen, #111500, testcase provided by
manu, #113241, reported by Pedro Gimeno/Michael Natterer. manu, #113241, reported by Pedro Gimeno/Michael Natterer.
* gtk/gtktreeview.c (validate_visible_area): scrolling to a dy * gtk/gtktreeview.c (validate_visible_area): scrolling to a dy
which is equal to the lower border of the window means scrolling which is equal to the lower border of the window means scrolling
to an invisible row, always update the dy when scrolling to an to an invisible row, always update the dy when scrolling to an
invisible row, corrected area_above/below calculations for invisible row, corrected area_above/below calculations for
......
...@@ -9509,6 +9509,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, ...@@ -9509,6 +9509,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
gint x, y; gint x, y;
GList *list; GList *list;
GdkDisplay *display; GdkDisplay *display;
GdkWindow *child, *parent;
if (node->children == NULL) if (node->children == NULL)
return FALSE; return FALSE;
...@@ -9655,12 +9656,19 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view, ...@@ -9655,12 +9656,19 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
* again. To do this, we fake a motion event and send it to ourselves. */ * again. To do this, we fake a motion event and send it to ourselves. */
display = gdk_drawable_get_display (tree_view->priv->bin_window); display = gdk_drawable_get_display (tree_view->priv->bin_window);
if (gdk_display_get_window_at_pointer (display, &x, &y) == tree_view->priv->bin_window) child = tree_view->priv->bin_window;
parent = gdk_window_get_parent (child);
if (gdk_window_get_pointer (parent, &x, &y, NULL) == child)
{ {
GdkEventMotion event; GdkEventMotion event;
gint child_x, child_y;
gdk_window_get_position (child, &child_x, &child_y);
event.window = tree_view->priv->bin_window; event.window = tree_view->priv->bin_window;
event.x = x; event.x = x - child_x;
event.y = y; event.y = y - child_y;
/* despite the fact this isn't a real event, I'm almost positive it will /* despite the fact this isn't a real event, I'm almost positive it will
* never trigger a drag event. maybe_drag is the only function that uses * never trigger a drag event. maybe_drag is the only function that uses
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment