diff options
author | Alexander Larsson <alexl@redhat.com> | 2009-12-16 18:26:59 +0100 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2009-12-16 18:26:59 +0100 |
commit | 36ba547921917daa970bd2d8510e3cd1bef894bf (patch) | |
tree | e389474b0c1baf3bc9510a44dbc8024f6a8203b6 /src/nautilus-window-slot.c | |
parent | 096453c004a2538b816046b0388d6cfb60b618b2 (diff) | |
download | nautilus-36ba547921917daa970bd2d8510e3cd1bef894bf.tar.gz |
Move active background color handling to the view
This stuff references view implementations and should not be in
the generic code.
Diffstat (limited to 'src/nautilus-window-slot.c')
-rw-r--r-- | src/nautilus-window-slot.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index f3d4125f6..82e507289 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -27,14 +27,11 @@ #include "nautilus-desktop-window.h" #include "nautilus-window-private.h" #include "nautilus-window-manage-views.h" -#include "file-manager/fm-directory-view.h" -#include "file-manager/fm-list-view.h" #include <libnautilus-private/nautilus-file.h> #include <libnautilus-private/nautilus-file-utilities.h> #include <libnautilus-private/nautilus-window-slot-info.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> -#include <eel/eel-background.h> static void nautilus_window_slot_init (NautilusWindowSlot *slot); static void nautilus_window_slot_class_init (NautilusWindowSlotClass *class); @@ -397,35 +394,18 @@ void nautilus_window_slot_is_in_active_pane (NautilusWindowSlot *slot, gboolean is_active) { - EelBackground *bg; - /* NULL is valid, and happens during init */ if (!slot) { return; } /* it may also be that the content is not a valid directory view during init */ - if (!FM_IS_DIRECTORY_VIEW (slot->content_view)) { - return; + if (slot->content_view != NULL) { + nautilus_view_set_is_active (slot->content_view, is_active); } - bg = EEL_BACKGROUND (fm_directory_view_get_background (FM_DIRECTORY_VIEW (slot->content_view))); - g_return_if_fail (EEL_IS_BACKGROUND (bg)); - - eel_background_set_active (bg, is_active); - - /* list view draws its background itself, so it needs special treatment */ - if (FM_IS_LIST_VIEW (slot->content_view)) { - GtkWidget *tree_view = GTK_WIDGET (fm_list_view_get_tree_view (FM_LIST_VIEW (slot->content_view))); - if (is_active) { - gtk_widget_modify_base (tree_view, GTK_STATE_NORMAL, NULL); - } else { - GtkStyle *style; - GdkColor color; - style = gtk_widget_get_style (tree_view); - color = style->base[GTK_STATE_INSENSITIVE]; - gtk_widget_modify_base (tree_view, GTK_STATE_NORMAL, &color); - } + if (slot->new_content_view != NULL) { + nautilus_view_set_is_active (slot->new_content_view, is_active); } } |