From 293be904e1852d0da0372c5fa71d7eaf491d5356 Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Sun, 3 Nov 2013 20:07:05 +0100 Subject: use the same icon size for the location button (the button that lets you toggle between button and text-based location bar) as for the close side pane button and the pathbar icons --- src/caja-navigation-window-pane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index da71661b..6266e020 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -242,7 +242,7 @@ location_button_create (CajaNavigationWindowPane *pane) GtkWidget *image; GtkWidget *button; - image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); gtk_widget_show (image); button = g_object_new (GTK_TYPE_TOGGLE_BUTTON, -- cgit v1.2.1 From dcb2d1918aa26db64727d14414983b6270b34cab Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Sun, 3 Nov 2013 21:24:31 +0100 Subject: remove a custom size allocation that broke stuff on GTK3 --- src/caja-side-pane.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src') diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index d3922b9f..a10fa2b7 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -133,33 +133,6 @@ select_panel (CajaSidePane *side_pane, SidePanel *panel) (GTK_NOTEBOOK (side_pane->details->notebook), page_num); } -static void -caja_side_pane_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - int width; - GtkAllocation child_allocation, frame_allocation; - CajaSidePane *pane; - GtkWidget *frame; - GtkWidget *hbox; - GtkRequisition child_requisition; - - GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); - - pane = CAJA_SIDE_PANE(widget); - frame = pane->details->title_frame; - hbox = pane->details->title_hbox; - - gtk_widget_get_preferred_size (hbox, &child_requisition, NULL); - width = child_requisition.width; - - gtk_widget_get_allocation (frame, &frame_allocation); - child_allocation = frame_allocation; - child_allocation.width = MAX (width, frame_allocation.width); - - gtk_widget_size_allocate (frame, &child_allocation); -} - /* initializing the class object by installing the operations we override */ static void caja_side_pane_class_init (CajaSidePaneClass *klass) @@ -172,7 +145,6 @@ caja_side_pane_class_init (CajaSidePaneClass *klass) gobject_class->finalize = caja_side_pane_finalize; gobject_class->dispose = caja_side_pane_dispose; - widget_class->size_allocate = caja_side_pane_size_allocate; signals[CLOSE_REQUESTED] = g_signal_new ("close_requested", -- cgit v1.2.1 From e6c9117493378ea67def5b57b8c97c433a096229 Mon Sep 17 00:00:00 2001 From: Elias Aebi Date: Wed, 6 Nov 2013 17:45:41 +0100 Subject: put the containers instead of the contents into the size group and remove the now unnecessary frame container --- src/caja-navigation-window-pane.c | 6 ++---- src/caja-side-pane.c | 14 ++------------ 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'src') 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); -- cgit v1.2.1