summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2014-09-02 11:18:08 -0700
committerCosimo Cecchi <cosimoc@gnome.org>2014-09-02 11:18:08 -0700
commit4693eceb2406ba60b78068bb8601acf4d81fa3bb (patch)
tree2833f90d2d8c32a879b2ce6fc20d6fc2523662b3
parentd582c7cf16b5e673950b1e99093fbf81fdfa1cda (diff)
downloadnautilus-4693eceb2406ba60b78068bb8601acf4d81fa3bb.tar.gz
style: remove notebook shadow hack
This is not needed anymore with the most recent theme.
-rw-r--r--src/Adwaita.css8
-rw-r--r--src/nautilus-window.c37
2 files changed, 0 insertions, 45 deletions
diff --git a/src/Adwaita.css b/src/Adwaita.css
index 170dae510..41639ec20 100644
--- a/src/Adwaita.css
+++ b/src/Adwaita.css
@@ -25,14 +25,6 @@
color: @theme_unfocused_selected_fg_color;
}
-NautilusWindow .sidebar .frame {
- border-style: none;
-}
-
-NautilusNotebook .frame {
- border-width: 0;
-}
-
/* Floating status bar */
.floating-bar {
padding: 2px;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 1bfca8460..2eb4d6d4f 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1317,33 +1317,6 @@ create_toolbar (NautilusWindow *window)
}
static void
-notebook_num_pages_changed (NautilusWindow *window)
-{
- NautilusView *view;
- NautilusWindowSlot *active_slot;
-
- active_slot = nautilus_window_get_active_slot (window);
- if (active_slot == NULL) {
- return;
- }
- view = nautilus_window_slot_get_current_view (active_slot);
- if (view == NULL) {
- return;
- }
-
- /* Only add a shadow to the scrolled window when we're in a tabless
- * notebook, since when the notebook has tabs, it will draw its own
- * border.
- */
- if (g_list_length (window->details->slots) > 1 ||
- NAUTILUS_IS_DESKTOP_WINDOW (window)) {
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_NONE);
- } else {
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view), GTK_SHADOW_IN);
- }
-}
-
-static void
notebook_page_removed_cb (GtkNotebook *notebook,
GtkWidget *page,
guint page_num,
@@ -1353,8 +1326,6 @@ notebook_page_removed_cb (GtkNotebook *notebook,
NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (page), *next_slot;
gboolean dnd_slot;
- notebook_num_pages_changed (window);
-
dnd_slot = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (slot), "dnd-window-slot"));
if (!dnd_slot) {
return;
@@ -1379,11 +1350,6 @@ notebook_page_added_cb (GtkNotebook *notebook,
NautilusWindowSlot *dummy_slot;
gboolean dnd_slot;
- /* It's too early here to call notebook_num_pages_changed(),
- * since the view might not be associagted to the slot yet.
- * Defer the call to nautilus_window_connect_content_view().
- */
-
dnd_slot = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (slot), "dnd-window-slot"));
if (!dnd_slot) {
return;
@@ -1986,9 +1952,6 @@ nautilus_window_connect_content_view (NautilusWindow *window,
g_signal_connect (view, "zoom-level-changed",
G_CALLBACK (zoom_level_changed_callback),
window);
-
- /* See the comment in notebook_page_added_cb() */
- notebook_num_pages_changed (window);
}
void