gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-06-30 23:46:35 +00:00
Code Issues Projects Releases Wiki Activity

history-controls: Don't assume NautilusWindow

Browse Source 
Middle click on back/forward buttons opens the previous/next location
in a new tab.

We want to reuse the history controls for FileChooser window, but it
will neither have tabs nor be a NautilusWindow at all.

So, make this feature conditional on the root widget being an instance
of NautilusWindow.

Part of: https://gitlab.gnome.org/GNOME/nautilus/-/work_items/3402
This commit is contained in:
António Fernandes 2024-04-28 16:15:50 +01:00
parent c036a1178c
commit 9698bcaccf
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/nautilus-history-controls.c
View File

@ -109,15 +109,10 @@ navigation_button_press_cb (GtkGestureClick *gesture,
gdouble y,
gpointer user_data)
{
NautilusHistoryControls *self;
NautilusWindow *window;
GtkWidget *widget;
guint button;
NautilusHistoryControls *self = NAUTILUS_HISTORY_CONTROLS (user_data);
self = NAUTILUS_HISTORY_CONTROLS (user_data);
button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
window = NAUTILUS_WINDOW (gtk_widget_get_root (GTK_WIDGET (self)));
GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
guint button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
if (button == GDK_BUTTON_PRIMARY)
{
@ -128,11 +123,19 @@ navigation_button_press_cb (GtkGestureClick *gesture,
else if (button == GDK_BUTTON_MIDDLE)
{
NautilusNavigationDirection direction;
GtkRoot *window = gtk_widget_get_root (GTK_WIDGET (self));
if (!NAUTILUS_IS_WINDOW (window))
{
/* Only NautilusWindow offers special behavior for this event. */
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
return;
}
direction = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (widget),
"nav-direction"));
nautilus_window_back_or_forward_in_new_tab (window, direction);
nautilus_window_back_or_forward_in_new_tab (NAUTILUS_WINDOW (window), direction);
}
else if (button == GDK_BUTTON_SECONDARY)
{