diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-02-11 17:30:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-02-11 17:30:33 +0000 |
| commit | f5739c8e0ef06398ad566d7ad7695e587f5d090d (patch) | |
| tree | ec0651ee1366640db55eae5449e963aca9a20782 /gtk/gtkpathbar.c | |
| parent | 9f338821f9fc109af4b9f6274458227b5d974379 (diff) | |
| download | gtk+-f5739c8e0ef06398ad566d7ad7695e587f5d090d.tar.gz | |
Stop scrolling when the pathbar goes away. (#167094, Rodney Dawes)
2005-02-11 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpathbar.c (gtk_path_bar_finalize): Stop scrolling
when the pathbar goes away. (#167094, Rodney Dawes)
(change_icon_theme): Use GTK_ICON_SIZE_MENU here as
well (Vincent Noel)
Diffstat (limited to 'gtk/gtkpathbar.c')
| -rw-r--r-- | gtk/gtkpathbar.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 4de2da197b..737cfc3f3b 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -54,7 +54,7 @@ typedef enum { static guint path_bar_signals [LAST_SIGNAL] = { 0 }; /* Icon size for if we can't get it from the theme */ -#define FALLBACK_ICON_SIZE 20 +#define FALLBACK_ICON_SIZE 16 typedef struct _ButtonData ButtonData; @@ -92,6 +92,7 @@ static void gtk_path_bar_scroll_up (GtkWidget *button, GtkPathBar *path_bar); static void gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar); +static void gtk_path_bar_stop_scrolling (GtkPathBar *path_bar); static gboolean gtk_path_bar_slider_button_press (GtkWidget *widget, GdkEventButton *event, GtkPathBar *path_bar); @@ -197,6 +198,9 @@ gtk_path_bar_finalize (GObject *object) GtkPathBar *path_bar; path_bar = GTK_PATH_BAR (object); + + gtk_path_bar_stop_scrolling (path_bar); + g_list_free (path_bar->button_list); if (path_bar->root_path) gtk_file_path_free (path_bar->root_path); @@ -835,7 +839,7 @@ change_icon_theme (GtkPathBar *path_bar) settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (path_bar))); - if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_BUTTON, &width, &height)) + if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &width, &height)) path_bar->icon_size = MAX (width, height); else path_bar->icon_size = FALLBACK_ICON_SIZE; |