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

files-view: Drop now-useless stack

Browse source 
It used to allow changing between regular view and empty view.

(Extracted by António Fernandes from originally larger patch)
This commit is contained in:
Corey Berla 2024-02-07 14:23:44 -08:00 committed by António Fernandes
parent 7b17260676
commit 518b07e141
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nautilus-files-view.c
View file

@ -233,8 +233,6 @@ typedef struct
GActionGroup *view_action_group; GActionGroup *view_action_group;
GtkWidget *stack;
/* Empty states */ /* Empty states */
GtkWidget *empty_view_page; GtkWidget *empty_view_page;
@ -9495,7 +9493,6 @@ nautilus_files_view_class_init (NautilusFilesViewClass *klass)
"/org/gnome/nautilus/ui/nautilus-files-view.ui"); "/org/gnome/nautilus/ui/nautilus-files-view.ui");
gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, overlay); gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, overlay);
gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, stack);
gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, floating_bar); gtk_widget_class_bind_template_child_private (widget_class, NautilusFilesView, floating_bar);
/* See also the global accelerators in init() in addition to all the local /* See also the global accelerators in init() in addition to all the local
@ -9760,7 +9757,7 @@ create_inner_view (NautilusFilesView *self,
} }
} }
gtk_stack_add_child (GTK_STACK (priv->stack), GTK_WIDGET (priv->list_base)); gtk_overlay_set_child (GTK_OVERLAY (priv->overlay), GTK_WIDGET (priv->list_base));
} }
void void
@ -9772,8 +9769,8 @@ nautilus_files_view_change (NautilusFilesView *self,
/* Prepare empty page for reuse. It's not destroyed because we own it. */ /* Prepare empty page for reuse. It's not destroyed because we own it. */
gtk_widget_unparent (priv->empty_view_page); gtk_widget_unparent (priv->empty_view_page);
/* Destroy existing inner view (which is owned by the stack) */ /* Destroy existing inner view (which is owned by the overlay) */
gtk_stack_remove (GTK_STACK (priv->stack), GTK_WIDGET (priv->list_base)); gtk_overlay_set_child (GTK_OVERLAY (priv->overlay), NULL);
/* Avoid subfolder items showing up in grid view. */ /* Avoid subfolder items showing up in grid view. */
nautilus_view_model_expand_as_a_tree (priv->model, FALSE); nautilus_view_model_expand_as_a_tree (priv->model, FALSE);

5
src/resources/ui/nautilus-files-view.ui
View file

@ -10,11 +10,6 @@
<object class="GtkOverlay" id="overlay"> <object class="GtkOverlay" id="overlay">
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<child>
<object class="GtkStack" id="stack">
<property name="hexpand">True</property>
</object>
</child>
<child type="overlay"> <child type="overlay">
<object class="NautilusFloatingBar" id="floating_bar"> <object class="NautilusFloatingBar" id="floating_bar">
<property name="halign">end</property> <property name="halign">end</property>