diff options
| author | Elias Aebi <[email protected]> | 2013-11-06 17:45:41 +0100 |
|---|---|---|
| committer | Elias Aebi <[email protected]> | 2013-11-06 17:45:41 +0100 |
| commit | e6c9117493378ea67def5b57b8c97c433a096229 (patch) | |
| tree | 5ec9f98c2c085b4cb0b3ec889867c7b92945184f /src | |
| parent | dcb2d1918aa26db64727d14414983b6270b34cab (diff) | |
| download | caja-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')
| -rw-r--r-- | src/caja-navigation-window-pane.c | 6 | ||||
| -rw-r--r-- | src/caja-side-pane.c | 14 |
2 files changed, 4 insertions, 16 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", diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index a10fa2b7..caea7d8e 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -48,7 +48,6 @@ struct _CajaSidePaneDetails GtkWidget *notebook; GtkWidget *menu; - GtkWidget *title_frame; GtkWidget *title_hbox; GtkWidget *title_label; GtkWidget *shortcut_box; @@ -302,7 +301,6 @@ static void caja_side_pane_init (GObject *object) { CajaSidePane *side_pane; - GtkWidget *frame; GtkWidget *hbox; GtkWidget *close_button; GtkWidget *select_button; @@ -314,19 +312,11 @@ caja_side_pane_init (GObject *object) side_pane->details = G_TYPE_INSTANCE_GET_PRIVATE (object, CAJA_TYPE_SIDE_PANE, CajaSidePaneDetails); - /* The frame (really a vbox) has the border */ - frame = gtk_vbox_new (FALSE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame), 4); - side_pane->details->title_frame = frame; - gtk_widget_show (frame); - gtk_box_pack_start (GTK_BOX (side_pane), frame, FALSE, FALSE, 0); - - /* And the title_hbox is what gets the same size as the other - headers */ hbox = gtk_hbox_new (FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); side_pane->details->title_hbox = hbox; gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (frame), hbox); + gtk_box_pack_start (GTK_BOX (side_pane), hbox, FALSE, FALSE, 0); select_button = gtk_toggle_button_new (); gtk_button_set_relief (GTK_BUTTON (select_button), GTK_RELIEF_NONE); |