diff --git a/ChangeLog b/ChangeLog index afd850abcb..8fe5b8b55c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-03 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): + Fix positioning near the monitor boundaries. (#154341, + Ken Harris) + 2004-10-01 Paolo Borelli * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it @@ -51,6 +57,7 @@ call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) +>>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index afd850abcb..8fe5b8b55c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-10-03 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): + Fix positioning near the monitor boundaries. (#154341, + Ken Harris) + 2004-10-01 Paolo Borelli * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it @@ -51,6 +57,7 @@ call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) +>>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index afd850abcb..8fe5b8b55c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-10-03 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): + Fix positioning near the monitor boundaries. (#154341, + Ken Harris) + 2004-10-01 Paolo Borelli * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it @@ -51,6 +57,7 @@ call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) +>>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index afd850abcb..8fe5b8b55c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-10-03 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): + Fix positioning near the monitor boundaries. (#154341, + Ken Harris) + 2004-10-01 Paolo Borelli * gtk/gtkmenutoolbutton.c: deactivate the menu before setiing it @@ -51,6 +57,7 @@ call layout_clear_attributes, and also delegate calls to dependent cell layouts. (#154191, Martyn Russell) +>>>>>>> 1.5869 2004-10-01 Matthias Clasen * modules/input/iminuktitut.c: Fix the spelling of Inuktitut diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 32cc7944e8..3f42c08f8c 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -12266,6 +12266,11 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view, GdkWindow *tree_window = GTK_WIDGET (tree_view)->window; GdkScreen *screen = gdk_drawable_get_screen (tree_window); GtkRequisition requisition; + gint monitor_num; + GdkRectangle monitor; + + monitor_num = gdk_screen_get_monitor_at_window (screen, tree_window); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); gtk_widget_realize (search_dialog);