Commit f2ae2a44 authored by Darin Adler's avatar Darin Adler

Fix rubberband selection when the icon view is scrolled by using the

	* libnautilus-private/nautilus-icon-container.c:
	(rubberband_timeout_callback): Fix rubberband selection when
	the icon view is scrolled by using the bin_window.

	* src/nautilus-sidebar.c: (nautilus_sidebar_destroy):
	Fix one of those "double-destroy" problems.

	* TODO: Formatting tweak.
	* configure.in: Formatting tweak.
parent ae4d6027
2002-01-04 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-icon-container.c:
(rubberband_timeout_callback): Fix rubberband selection when
the icon view is scrolled by using the bin_window.
* src/nautilus-sidebar.c: (nautilus_sidebar_destroy):
Fix one of those "double-destroy" problems.
* TODO: Formatting tweak.
* configure.in: Formatting tweak.
2002-01-04 Dave Camp <dave@ximian.com>
* components/adapter/nautilus-zoomable-proxy.c
......
......@@ -2,7 +2,8 @@ For tasks outside the porting effort, we track them as bugs in
http://bugzilla.gnome.org. For the porting effort, please let
darin@bentspoon.com know what you are working on.
- Make closing a window work (Bonobo fixes needed?).
- Make closing a window work without crashing (Bonobo fixes needed?).
- Port list view to GtkTreeView and then go to eel and remove
EelCList, EelList, and EelListColumnTitle.
- Port tree sidebar panel to GtkTreeView and then go to eel and
......
AC_INIT(src)
dnl ==========================================================================
dnl
dnl If you add a version number here, you *must* add an AC_SUBST line for
dnl it too, or it will never make it into the spec file!
dnl
dnl ==========================================================================
dnl ===========================================================================
ART_REQUIRED=2.3.6
BONOBO_ACTIVATION_REQUIRED=0.9.3
......
......@@ -1425,6 +1425,7 @@ rubberband_timeout_callback (gpointer data)
GtkWidget *widget;
NautilusIconRubberbandInfo *band_info;
int x, y;
int bin_x, bin_y;
double x1, y1, x2, y2;
double world_x, world_y;
int x_scroll, y_scroll;
......@@ -1438,6 +1439,7 @@ rubberband_timeout_callback (gpointer data)
g_assert (GNOME_IS_CANVAS_RECT (band_info->selection_rectangle));
gdk_window_get_pointer (widget->window, &x, &y, NULL);
gdk_window_get_pointer (GTK_LAYOUT (widget)->bin_window, &bin_x, &bin_y, NULL);
if (x < 0) {
x_scroll = x;
......@@ -1467,7 +1469,7 @@ rubberband_timeout_callback (gpointer data)
nautilus_icon_container_scroll (container, x_scroll, y_scroll);
gnome_canvas_window_to_world (GNOME_CANVAS (container),
x, y, &world_x, &world_y);
bin_x, bin_y, &world_x, &world_y);
if (world_x < band_info->start_x) {
x1 = world_x;
......@@ -1510,7 +1512,6 @@ rubberband_timeout_callback (gpointer data)
gnome_canvas_item_raise_to_top (band_info->selection_rectangle);
band_info->prev_x = x;
band_info->prev_y = y;
......
......@@ -322,16 +322,15 @@ nautilus_sidebar_destroy (GtkObject *object)
g_free (sidebar->details);
sidebar->details = NULL;
}
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
nautilus_sidebar_theme_changed,
sidebar);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
nautilus_sidebar_confirm_trash_changed,
sidebar);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
nautilus_sidebar_theme_changed,
sidebar);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
nautilus_sidebar_confirm_trash_changed,
sidebar);
}
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
......
......@@ -322,16 +322,15 @@ nautilus_sidebar_destroy (GtkObject *object)
g_free (sidebar->details);
sidebar->details = NULL;
}
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
nautilus_sidebar_theme_changed,
sidebar);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
nautilus_sidebar_confirm_trash_changed,
sidebar);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME,
nautilus_sidebar_theme_changed,
sidebar);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH,
nautilus_sidebar_confirm_trash_changed,
sidebar);
}
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
......
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