AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

bgo#486839 - Fix path bar size group in the file chooser

Browse Source 
Since the location button is hidden in save mode, we need to add the
path bar to the size group too. The location button still has to be in
the group though, because it's larger than the path bar (when
shown). Instead of using the recent/search icons, add their hboxes so
that themed widget spacings don't introduce variations.
This commit is contained in:
Milan Bouchet-Valat 2009-10-07 22:08:41 +02:00 committed by Federico Mena Quintero
parent 9e81022bf6
commit e02252cdd6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkfilechooserdefault.c
View File

@ -4927,8 +4927,6 @@ location_button_create (GtkFileChooserDefault *impl)
impl->location_button = g_object_new (GTK_TYPE_TOGGLE_BUTTON, impl->location_button = g_object_new (GTK_TYPE_TOGGLE_BUTTON,
"image", image, "image", image,
NULL); NULL);
gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->location_button);
g_signal_connect (impl->location_button, "toggled", g_signal_connect (impl->location_button, "toggled",
G_CALLBACK (location_button_toggled_cb), impl); G_CALLBACK (location_button_toggled_cb), impl);
@ -4965,6 +4963,7 @@ browse_widgets_create (GtkFileChooserDefault *impl)
location_button_create (impl); location_button_create (impl);
gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->location_button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->location_button, FALSE, FALSE, 0);
gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->location_button);
/* Path bar */ /* Path bar */
@ -4972,6 +4971,7 @@ browse_widgets_create (GtkFileChooserDefault *impl)
g_signal_connect (impl->browse_path_bar, "path-clicked", G_CALLBACK (path_bar_clicked), impl); g_signal_connect (impl->browse_path_bar, "path-clicked", G_CALLBACK (path_bar_clicked), impl);
gtk_widget_show_all (impl->browse_path_bar); gtk_widget_show_all (impl->browse_path_bar);
gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_path_bar, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_path_bar, TRUE, TRUE, 0);
gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->browse_path_bar);
/* Create Folder */ /* Create Folder */
impl->browse_new_folder_button = gtk_button_new_with_mnemonic (_("Create Fo_lder")); impl->browse_new_folder_button = gtk_button_new_with_mnemonic (_("Create Fo_lder"));
@ -8847,7 +8847,6 @@ search_setup_widgets (GtkFileChooserDefault *impl)
/* Image */ /* Image */
image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON); image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
gtk_size_group_add_widget (GTK_SIZE_GROUP (impl->browse_path_bar_size_group), image);
gtk_box_pack_start (GTK_BOX (impl->search_hbox), image, FALSE, FALSE, 5); gtk_box_pack_start (GTK_BOX (impl->search_hbox), image, FALSE, FALSE, 5);
/* Label */ /* Label */
@ -8892,6 +8891,7 @@ search_setup_widgets (GtkFileChooserDefault *impl)
/* Box for search widgets */ /* Box for search widgets */
gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->search_hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->search_hbox, TRUE, TRUE, 0);
gtk_widget_show_all (impl->search_hbox); gtk_widget_show_all (impl->search_hbox);
gtk_size_group_add_widget (GTK_SIZE_GROUP (impl->browse_path_bar_size_group), impl->search_hbox);
/* Hide the location widgets temporarily */ /* Hide the location widgets temporarily */
@ -9273,10 +9273,9 @@ recent_hide_entry (GtkFileChooserDefault *impl)
gchar *tmp; gchar *tmp;
impl->recent_hbox = gtk_hbox_new (FALSE, 12); impl->recent_hbox = gtk_hbox_new (FALSE, 12);
/* Image */ /* Image */
image = gtk_image_new_from_icon_name ("document-open-recent", GTK_ICON_SIZE_BUTTON); image = gtk_image_new_from_icon_name ("document-open-recent", GTK_ICON_SIZE_BUTTON);
gtk_size_group_add_widget (impl->browse_path_bar_size_group, image);
gtk_box_pack_start (GTK_BOX (impl->recent_hbox), image, FALSE, FALSE, 5); gtk_box_pack_start (GTK_BOX (impl->recent_hbox), image, FALSE, FALSE, 5);
/* Label */ /* Label */
@ -9291,6 +9290,7 @@ recent_hide_entry (GtkFileChooserDefault *impl)
/* Box for recent widgets */ /* Box for recent widgets */
gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->recent_hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->recent_hbox, TRUE, TRUE, 0);
gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->recent_hbox);
gtk_widget_show_all (impl->recent_hbox); gtk_widget_show_all (impl->recent_hbox);
/* Hide the location widgets temporarily */ /* Hide the location widgets temporarily */