summaryrefslogtreecommitdiff
path: root/src/caja-navigation-window-pane.c
diff options
context:
space:
mode:
authorElias Aebi <[email protected]>2013-11-06 17:45:41 +0100
committerElias Aebi <[email protected]>2013-11-06 17:45:41 +0100
commite6c9117493378ea67def5b57b8c97c433a096229 (patch)
tree5ec9f98c2c085b4cb0b3ec889867c7b92945184f /src/caja-navigation-window-pane.c
parentdcb2d1918aa26db64727d14414983b6270b34cab (diff)
downloadcaja-e6c9117493378ea67def5b57b8c97c433a096229.tar.bz2
caja-e6c9117493378ea67def5b57b8c97c433a096229.tar.xz
put the containers instead of the contents into the size group and remove the now unnecessary frame container
Diffstat (limited to 'src/caja-navigation-window-pane.c')
-rw-r--r--src/caja-navigation-window-pane.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 6266e020..ce079e21 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -739,15 +739,15 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane)
FALSE, FALSE, 0);
gtk_widget_show (hbox);
+ /* the header size group ensures that the location bar has the same height as the sidebar header */
header_size_group = CAJA_NAVIGATION_WINDOW (CAJA_WINDOW_PANE (pane)->window)->details->header_size_group;
+ gtk_size_group_add_widget (header_size_group, pane->location_bar);
pane->location_button = location_button_create (pane);
- gtk_size_group_add_widget (header_size_group, pane->location_button);
gtk_box_pack_start (GTK_BOX (hbox), pane->location_button, FALSE, FALSE, 0);
gtk_widget_show (pane->location_button);
pane->path_bar = g_object_new (CAJA_TYPE_PATH_BAR, NULL);
- gtk_size_group_add_widget (header_size_group, pane->path_bar);
gtk_widget_show (pane->path_bar);
g_signal_connect_object (pane->path_bar, "path_clicked",
@@ -760,7 +760,6 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane)
TRUE, TRUE, 0);
pane->navigation_bar = caja_location_bar_new (pane);
- gtk_size_group_add_widget (header_size_group, pane->navigation_bar);
g_signal_connect_object (pane->navigation_bar, "location_changed",
G_CALLBACK (navigation_bar_location_changed_callback), pane, 0);
g_signal_connect_object (pane->navigation_bar, "cancel",
@@ -774,7 +773,6 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane)
TRUE, TRUE, 0);
pane->search_bar = caja_search_bar_new ();
- gtk_size_group_add_widget (header_size_group, pane->search_bar);
g_signal_connect_object (pane->search_bar, "activate",
G_CALLBACK (search_bar_activate_callback), pane, 0);
g_signal_connect_object (pane->search_bar, "cancel",