gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-01 05:23:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

toolbar: Handle showing current location menu

Browse source 
This makes NautilusPathBar effectively private to NautilusToolbar,
like NautilusLocationEntry already is.
This commit is contained in:
António Fernandes 2024-05-12 21:50:02 +01:00
parent 874150b017
commit 3e8b382fce
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nautilus-toolbar.c
View file

@ -437,12 +437,6 @@ nautilus_toolbar_new (void)
NULL); NULL);
} }
GtkWidget *
nautilus_toolbar_get_path_bar (NautilusToolbar *self)
{
return self->path_bar;
}
static void static void
box_remove_all_children (GtkBox *box) box_remove_all_children (GtkBox *box)
{ {
@ -493,6 +487,12 @@ slot_on_templates_menu_changed (NautilusToolbar *self,
menu); menu);
} }
void
nautilus_toolbar_show_current_location_menu (NautilusToolbar *self)
{
nautilus_path_bar_show_current_location_menu (NAUTILUS_PATH_BAR (self->path_bar));
}
/* Called from on_window_slot_destroyed(), since bindings and signal handlers /* Called from on_window_slot_destroyed(), since bindings and signal handlers
* are automatically removed once the slot goes away. * are automatically removed once the slot goes away.
*/ */

2
src/nautilus-toolbar.h
View file

@ -36,7 +36,7 @@ G_DECLARE_FINAL_TYPE (NautilusToolbar, nautilus_toolbar, NAUTILUS, TOOLBAR, AdwB
GtkWidget *nautilus_toolbar_new (void); GtkWidget *nautilus_toolbar_new (void);
GtkWidget *nautilus_toolbar_get_path_bar (NautilusToolbar *self); void nautilus_toolbar_show_current_location_menu (NautilusToolbar *self);
void nautilus_toolbar_open_location_entry (NautilusToolbar *self, void nautilus_toolbar_open_location_entry (NautilusToolbar *self,
const char *special_text); const char *special_text);

8
src/nautilus-window.c
View file

@ -53,7 +53,6 @@
#include "nautilus-network-address-bar.h" #include "nautilus-network-address-bar.h"
#include "nautilus-mime-actions.h" #include "nautilus-mime-actions.h"
#include "nautilus-module.h" #include "nautilus-module.h"
#include "nautilus-pathbar.h"
#include "nautilus-progress-indicator.h" #include "nautilus-progress-indicator.h"
#include "nautilus-scheme.h" #include "nautilus-scheme.h"
#include "nautilus-shortcut-manager.h" #include "nautilus-shortcut-manager.h"
@ -381,12 +380,9 @@ action_show_current_location_menu (GSimpleAction *action,
GVariant *state, GVariant *state,
gpointer user_data) gpointer user_data)
{ {
NautilusWindow *window = user_data; NautilusWindow *self = NAUTILUS_WINDOW (user_data);
GtkWidget *path_bar;
path_bar = nautilus_toolbar_get_path_bar (NAUTILUS_TOOLBAR (window->toolbar)); nautilus_toolbar_show_current_location_menu (NAUTILUS_TOOLBAR (self->toolbar));
nautilus_path_bar_show_current_location_menu (NAUTILUS_PATH_BAR (path_bar));
} }
static void static void