Complete the fix for #165770, Vincent Untz:

2005-02-11  Matthias Clasen  <mclasen@redhat.com>

	Complete the fix for #165770, Vincent Untz:

	* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
	fallback size be 16, to be equal to the default for
	GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
	(gtk_file_chooser_button_init):
	(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
	GTK_ICON_SIZE_SMALL_TOOLBAR.
This commit is contained in:
Matthias Clasen 2005-02-11 06:17:16 +00:00 committed by Matthias Clasen
parent 8b02fa1fca
commit 1c10200c25
4 changed files with 36 additions and 3 deletions

View File

@ -1,3 +1,14 @@
2005-02-11 Matthias Clasen <mclasen@redhat.com>
Complete the fix for #165770, Vincent Untz:
* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
fallback size be 16, to be equal to the default for
GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
(gtk_file_chooser_button_init):
(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
GTK_ICON_SIZE_SMALL_TOOLBAR.
2005-02-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL

View File

@ -1,3 +1,14 @@
2005-02-11 Matthias Clasen <mclasen@redhat.com>
Complete the fix for #165770, Vincent Untz:
* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
fallback size be 16, to be equal to the default for
GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
(gtk_file_chooser_button_init):
(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
GTK_ICON_SIZE_SMALL_TOOLBAR.
2005-02-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL

View File

@ -1,3 +1,14 @@
2005-02-11 Matthias Clasen <mclasen@redhat.com>
Complete the fix for #165770, Vincent Untz:
* gtk/gtkfilechooserbutton.c (FALLBACK_ICON_SIZE): Make the
fallback size be 16, to be equal to the default for
GTK_ICON_SIZE_MENU (in gtkiconfactory.c:init_icon_sizes()).
(gtk_file_chooser_button_init):
(change_icon_theme): Use GTK_ICON_SIZE_MENU instead of
GTK_ICON_SIZE_SMALL_TOOLBAR.
2005-02-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current): Fix RTL

View File

@ -67,7 +67,7 @@
#define DESKTOP_DISPLAY_NAME N_("Desktop")
#define FALLBACK_DISPLAY_NAME N_("(None)")
#define FALLBACK_ICON_NAME "stock_unknown"
#define FALLBACK_ICON_SIZE 20
#define FALLBACK_ICON_SIZE 16
/* ********************** *
@ -413,7 +413,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button)
gtk_widget_show (sep);
image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
GTK_ICON_SIZE_SMALL_TOOLBAR);
GTK_ICON_SIZE_MENU);
gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 0);
gtk_widget_show (image);
@ -1043,7 +1043,7 @@ change_icon_theme (GtkFileChooserButton *button)
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_SMALL_TOOLBAR,
if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
&width, &height))
priv->icon_size = MAX (width, height);
else