From e959cd8f001d3d1e7285563ed25818d79461ff1e Mon Sep 17 00:00:00 2001
From: Alexander Schwinn <alexxcons@xfce.org>
Date: Sun, 6 Sep 2020 16:30:51 +0200
Subject: [PATCH] Fix Regressions around menu bar spinner (Issue #394)
Fixes -394
---
thunar/thunar-window.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 3fab2409b..3686d334d 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -711,7 +711,7 @@ thunar_window_init (ThunarWindow *window)
/* Add a spinner besides the menubar */
window->spinner = gtk_spinner_new ();
gtk_grid_attach (GTK_GRID (window->grid), window->spinner, 1, 0, 1, 1);
- exo_binding_new (G_OBJECT (window->spinner), "active",
+ exo_binding_new (G_OBJECT (window->menubar), "visible",
G_OBJECT (window->spinner), "visible");
/* check if we need to add the root warning */
@@ -721,7 +721,7 @@ thunar_window_init (ThunarWindow *window)
infobar = gtk_info_bar_new ();
gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_WARNING);
gtk_widget_set_hexpand (infobar, TRUE);
- gtk_grid_attach (GTK_GRID (window->grid), infobar, 0, 2, 1, 1);
+ gtk_grid_attach (GTK_GRID (window->grid), infobar, 0, 2, 2, 1);
gtk_widget_show (infobar);
/* add the label with the root warning */
@@ -734,7 +734,7 @@ thunar_window_init (ThunarWindow *window)
gtk_container_set_border_width (GTK_CONTAINER (window->paned), 0);
gtk_widget_set_hexpand (window->paned, TRUE);
gtk_widget_set_vexpand (window->paned, TRUE);
- gtk_grid_attach (GTK_GRID (window->grid), window->paned, 0, 4, 1, 1);
+ gtk_grid_attach (GTK_GRID (window->grid), window->paned, 0, 4, 2, 1);
gtk_widget_show (window->paned);
/* determine the last separator position and apply it to the paned view */
@@ -750,7 +750,7 @@ thunar_window_init (ThunarWindow *window)
window->notebook = gtk_notebook_new ();
gtk_widget_set_hexpand (window->notebook, TRUE);
gtk_widget_set_vexpand (window->notebook, TRUE);
- gtk_grid_attach (GTK_GRID (window->view_box), window->notebook, 0, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (window->view_box), window->notebook, 0, 1, 2, 1);
g_signal_connect (G_OBJECT (window->notebook), "switch-page", G_CALLBACK (thunar_window_notebook_switch_page), window);
g_signal_connect (G_OBJECT (window->notebook), "page-added", G_CALLBACK (thunar_window_notebook_page_added), window);
g_signal_connect (G_OBJECT (window->notebook), "page-removed", G_CALLBACK (thunar_window_notebook_page_removed), window);
@@ -777,7 +777,7 @@ thunar_window_init (ThunarWindow *window)
gtk_toolbar_set_icon_size (GTK_TOOLBAR (window->location_toolbar),
small_icons ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_set_hexpand (window->location_toolbar, TRUE);
- gtk_grid_attach (GTK_GRID (window->grid), window->location_toolbar, 0, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (window->grid), window->location_toolbar, 0, 1, 2, 1);
window->location_toolbar_item_back = xfce_gtk_tool_button_new_from_action_entry (get_action_entry (THUNAR_WINDOW_ACTION_BACK), G_OBJECT (window), GTK_TOOLBAR (window->location_toolbar));
window->location_toolbar_item_forward = xfce_gtk_tool_button_new_from_action_entry (get_action_entry (THUNAR_WINDOW_ACTION_FORWARD), G_OBJECT (window), GTK_TOOLBAR (window->location_toolbar));
@@ -829,7 +829,7 @@ thunar_window_init (ThunarWindow *window)
/* setup a new statusbar */
window->statusbar = thunar_statusbar_new ();
gtk_widget_set_hexpand (window->statusbar, TRUE);
- gtk_grid_attach (GTK_GRID (window->view_box), window->statusbar, 0, 2, 1, 1);
+ gtk_grid_attach (GTK_GRID (window->view_box), window->statusbar, 0, 2, 2, 1);
if (last_statusbar_visible)
gtk_widget_show (window->statusbar);
--
GitLab