summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/caja-navigation-window-pane.c161
-rw-r--r--src/caja-notebook.c2
-rw-r--r--src/caja-window-slot.c1
3 files changed, 164 insertions, 0 deletions
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 5e870d45..aeff3a12 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -33,6 +33,7 @@
#include "caja-navigation-window-pane.h"
#include "caja-window-private.h"
#include "caja-window-manage-views.h"
+#include "caja-application.h"
#include "caja-pathbar.h"
#include "caja-location-bar.h"
#include "caja-notebook.h"
@@ -496,6 +497,142 @@ notebook_popup_menu_cb (GtkWidget *widget,
return TRUE;
}
+static void
+notebook_page_removed_cb (GtkNotebook *notebook,
+ GtkWidget *page,
+ guint page_num,
+ CajaNavigationWindowPane *pane)
+{
+ CajaWindowPane *wpane = CAJA_WINDOW_PANE (pane);
+ CajaWindowSlot *slot;
+
+ /* This callback is only reached via DnD (blocked during normal removal).
+ * Look up the slot that owns this content_box. */
+ slot = g_object_get_data (G_OBJECT (page), "caja-slot");
+ if (slot == NULL || slot->pane != wpane)
+ {
+ return;
+ }
+
+ /* If this was the active slot, activate another one */
+ if (wpane->active_slot == slot)
+ {
+ CajaWindowSlot *next_slot = NULL;
+ GList *l;
+
+ for (l = wpane->slots; l != NULL; l = l->next)
+ {
+ if (l->data != slot)
+ {
+ next_slot = l->data;
+ break;
+ }
+ }
+ if (next_slot != NULL)
+ {
+ caja_window_set_active_slot (wpane->window, next_slot);
+ }
+ else
+ {
+ wpane->active_slot = NULL;
+ }
+ }
+
+ /* Remove slot from source pane bookkeeping without destroying it */
+ wpane->slots = g_list_remove (wpane->slots, slot);
+ wpane->active_slots = g_list_remove (wpane->active_slots, slot);
+
+ /* If the source window is now empty, close it */
+ if (wpane->slots == NULL)
+ {
+ caja_window_close (wpane->window);
+ }
+}
+
+static void
+notebook_page_added_cb (GtkNotebook *notebook,
+ GtkWidget *page,
+ guint page_num,
+ CajaNavigationWindowPane *pane)
+{
+ CajaWindowPane *wpane = CAJA_WINDOW_PANE (pane);
+ CajaWindowSlot *slot;
+ gboolean from_new_window;
+
+ /* This callback is only reached via DnD (blocked during normal addition).
+ * Look up the slot that owns this content_box. */
+ slot = g_object_get_data (G_OBJECT (page), "caja-slot");
+ if (slot == NULL || slot->pane == wpane)
+ {
+ return;
+ }
+
+ /* "caja-dnd-slot" is set only for the create-new-window case */
+ from_new_window = (g_object_get_data (G_OBJECT (page), "caja-dnd-slot") != NULL);
+ g_object_set_data (G_OBJECT (page), "caja-dnd-slot", NULL);
+
+ /* For new-window drops: close the dummy slot the constructor created.
+ * Grab it before we append the DnD slot so we can distinguish them. */
+ CajaWindowSlot *dummy_slot = from_new_window ?
+ g_list_nth_data (wpane->slots, 0) : NULL;
+
+ /* Adopt the slot into this pane */
+ slot->pane = wpane;
+ wpane->slots = g_list_append (wpane->slots, slot);
+
+ caja_window_set_active_slot (wpane->window, slot);
+
+ if (dummy_slot != NULL)
+ {
+ caja_window_close_slot (dummy_slot);
+ }
+
+ gtk_notebook_set_show_tabs (notebook,
+ gtk_notebook_get_n_pages (notebook) > 1);
+
+ gtk_widget_show (GTK_WIDGET (wpane->window));
+
+ if (from_new_window)
+ {
+ /* Release the extra ref taken in notebook_create_window_cb */
+ g_object_unref (slot);
+ }
+}
+
+static GtkNotebook *
+notebook_create_window_cb (GtkNotebook *notebook,
+ GtkWidget *page,
+ gint x,
+ gint y,
+ CajaNavigationWindowPane *pane)
+{
+ CajaApplication *app;
+ CajaNavigationWindow *new_window;
+ CajaWindowPane *new_pane;
+ CajaWindowSlot *slot;
+
+ /* Find which slot owns this content_box */
+ slot = caja_window_pane_get_slot_for_content_box (CAJA_WINDOW_PANE (pane), page);
+ if (slot == NULL)
+ {
+ return NULL;
+ }
+
+ /* Tag the content_box so page-removed/added callbacks can identify it */
+ g_object_ref (slot);
+ g_object_set_data (G_OBJECT (page), "caja-dnd-slot", slot);
+
+ app = CAJA_APPLICATION (g_application_get_default ());
+ new_window = CAJA_NAVIGATION_WINDOW (
+ caja_application_create_navigation_window (app,
+ gtk_widget_get_screen (GTK_WIDGET (notebook))));
+
+ new_pane = CAJA_WINDOW_PANE (
+ g_list_first (CAJA_WINDOW (new_window)->details->panes)->data);
+
+ return GTK_NOTEBOOK (CAJA_NAVIGATION_WINDOW_PANE (new_pane)->notebook);
+}
+
static gboolean
notebook_switch_page_cb (GtkNotebook *notebook,
GtkWidget *page,
@@ -528,8 +665,14 @@ caja_navigation_window_pane_remove_page (CajaNavigationWindowPane *pane, int pag
g_signal_handlers_block_by_func (notebook,
G_CALLBACK (notebook_switch_page_cb),
pane);
+ g_signal_handlers_block_by_func (notebook,
+ G_CALLBACK (notebook_page_removed_cb),
+ pane);
gtk_notebook_remove_page (notebook, page_num);
g_signal_handlers_unblock_by_func (notebook,
+ G_CALLBACK (notebook_page_removed_cb),
+ pane);
+ g_signal_handlers_unblock_by_func (notebook,
G_CALLBACK (notebook_switch_page_cb),
pane);
}
@@ -543,6 +686,9 @@ caja_navigation_window_pane_add_slot_in_tab (CajaNavigationWindowPane *pane, Caj
g_signal_handlers_block_by_func (notebook,
G_CALLBACK (notebook_switch_page_cb),
pane);
+ g_signal_handlers_block_by_func (notebook,
+ G_CALLBACK (notebook_page_added_cb),
+ pane);
caja_notebook_add_tab (notebook,
slot,
(flags & CAJA_WINDOW_OPEN_SLOT_APPEND) != 0 ?
@@ -550,6 +696,9 @@ caja_navigation_window_pane_add_slot_in_tab (CajaNavigationWindowPane *pane, Caj
gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook)) + 1,
FALSE);
g_signal_handlers_unblock_by_func (notebook,
+ G_CALLBACK (notebook_page_added_cb),
+ pane);
+ g_signal_handlers_unblock_by_func (notebook,
G_CALLBACK (notebook_switch_page_cb),
pane);
}
@@ -754,6 +903,18 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane)
"switch-page",
G_CALLBACK (notebook_switch_page_cb),
pane);
+ g_signal_connect (pane->notebook,
+ "create-window",
+ G_CALLBACK (notebook_create_window_cb),
+ pane);
+ g_signal_connect (pane->notebook,
+ "page-added",
+ G_CALLBACK (notebook_page_added_cb),
+ pane);
+ g_signal_connect (pane->notebook,
+ "page-removed",
+ G_CALLBACK (notebook_page_removed_cb),
+ pane);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (pane->notebook), FALSE);
gtk_notebook_set_show_border (GTK_NOTEBOOK (pane->notebook), FALSE);
diff --git a/src/caja-notebook.c b/src/caja-notebook.c
index ded19ead..0d9cd73f 100644
--- a/src/caja-notebook.c
+++ b/src/caja-notebook.c
@@ -183,6 +183,7 @@ caja_notebook_init (CajaNotebook *notebook)
gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE);
gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
+ gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook), "CajaNotebook");
g_signal_connect (notebook, "button-press-event",
(GCallback)button_press_cb, NULL);
@@ -373,6 +374,7 @@ caja_notebook_insert_page (GtkNotebook *gnotebook,
gtk_notebook_set_show_tabs (gnotebook,
gtk_notebook_get_n_pages (gnotebook) > 1);
gtk_notebook_set_tab_reorderable (gnotebook, tab_widget, TRUE);
+ gtk_notebook_set_tab_detachable (gnotebook, tab_widget, TRUE);
return position;
}
diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c
index dab7c449..2f8050a0 100644
--- a/src/caja-window-slot.c
+++ b/src/caja-window-slot.c
@@ -183,6 +183,7 @@ caja_window_slot_init (CajaWindowSlot *slot)
content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
slot->content_box = content_box;
gtk_widget_show (content_box);
+ g_object_set_data (G_OBJECT (content_box), "caja-slot", slot);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-09 18:25:20 +0000