From be65c8634951114d754943cf1517a07831b25aea Mon Sep 17 00:00:00 2001 From: federico Date: Sun, 15 Apr 2001 09:39:24 +0000 Subject: [PATCH] 2001-04-14 Federico Mena Quintero * gdesktop.c (desktop_icon_set_busy): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW. (click_proxy_button_press): Likewise. * gcmd.c (set_cursor_normal): Set the cursor to NULL so that we pick up the cursor that the window manager set for us. * gscreen.c (panel_tree_scan_begin): Use set_cursor_busy(). (panel_tree_scan_end): Uset set_cursor_normal(). --- gnome/ChangeLog | 12 ++++++++++++ gnome/gcmd.c | 4 +--- gnome/gdesktop.c | 4 ++-- gnome/gscreen.c | 21 ++++++++------------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gnome/ChangeLog b/gnome/ChangeLog index 564b26b7a..f5d838a90 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,15 @@ +2001-04-14 Federico Mena Quintero + + * gdesktop.c (desktop_icon_set_busy): Use a pretty arrow instead + of GDK_TOP_LEFT_ARROW. + (click_proxy_button_press): Likewise. + + * gcmd.c (set_cursor_normal): Set the cursor to NULL so that we + pick up the cursor that the window manager set for us. + + * gscreen.c (panel_tree_scan_begin): Use set_cursor_busy(). + (panel_tree_scan_end): Uset set_cursor_normal(). + 2001-04-11 Miguel de Icaza * gdesktop.c (should_hide_nautilus_file): New function, used to diff --git a/gnome/gcmd.c b/gnome/gcmd.c index bdc6e4f9e..e6947bc1c 100644 --- a/gnome/gcmd.c +++ b/gnome/gcmd.c @@ -989,9 +989,7 @@ set_cursor_normal (WPanel *panel) if (is_a_desktop_panel (panel)) return; - cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW); - gdk_window_set_cursor (GTK_WIDGET (panel->xwindow)->window, cursor); - gdk_cursor_destroy (cursor); + gdk_window_set_cursor (GTK_WIDGET (panel->xwindow)->window, NULL); gdk_flush (); } diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c index 5ea55dad1..d90871de1 100644 --- a/gnome/gdesktop.c +++ b/gnome/gdesktop.c @@ -1752,7 +1752,7 @@ desktop_icon_set_busy (DesktopIconInfo *dii, int busy) if (!GTK_WIDGET_REALIZED (dii->dicon)) return; - cursor = gdk_cursor_new (busy ? GDK_WATCH : GDK_TOP_LEFT_ARROW); + cursor = gdk_cursor_new (busy ? GDK_WATCH : GDK_LEFT_PTR); gdk_window_set_cursor (dii->dicon->window, cursor); gdk_cursor_destroy (cursor); gdk_flush (); @@ -3246,7 +3246,7 @@ click_proxy_button_press (GtkWidget *widget, GdkEventButton *event, gpointer dat XGrabServer (GDK_DISPLAY ()); - cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW); + cursor = gdk_cursor_new (GDK_LEFT_PTR); gdk_pointer_grab (GDK_ROOT_PARENT (), FALSE, GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, diff --git a/gnome/gscreen.c b/gnome/gscreen.c index 1aa817b03..0e98c8065 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -1729,27 +1729,22 @@ panel_chdir (GtkDTree *dtree, char *path, WPanel *panel) show_dir (panel); } -static void -set_cursor (WPanel *panel, GdkCursorType type) -{ - GdkCursor *cursor; - - cursor = gdk_cursor_new (type); - gdk_window_set_cursor (GTK_WIDGET (panel->xwindow)->window, cursor); - gdk_cursor_destroy (cursor); - gdk_flush (); -} - static void panel_tree_scan_begin (GtkWidget *widget, gpointer data) { - set_cursor (data, GDK_WATCH); + WPanel *panel; + + panel = data; + set_cursor_busy (panel); } static void panel_tree_scan_end (GtkWidget *widget, gpointer data) { - set_cursor (data, GDK_TOP_LEFT_ARROW); + WPanel *panel; + + panel = data; + set_cursor_normal (panel); } /* Handler for the possibly_ungrab signal of the dtree widget */