Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bgo141154 filechooser icon view only gio #2

Merged
merged 1 commit into from Apr 30, 2011
Merged

Bgo141154 filechooser icon view only gio #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 19 additions & 19 deletions gtk/gtkfilechooserdefault.c
View file
Open in desktop
Expand Up @@ -246,8 +246,8 @@ typedef enum {
} ShortcutsIndex;

/* Icon size for if we can't get it from the theme */
#define FALLBACK_LIST_VIEW_ICON_SIZE 16
#define FALLBACK_ICON_VIEW_ICON_SIZE 48
#define FALLBACK_ICON_SIZE_FOR_LIST_VIEW 16
#define FALLBACK_ICON_SIZE_FOR_ICON_VIEW 48

#define THUMBNAIL_ICON_SIZE 100
#define ICON_VIEW_ITEM_WIDTH 120
Expand Down Expand Up @@ -761,8 +761,8 @@ _gtk_file_chooser_default_init (GtkFileChooserDefault *impl)
impl->select_multiple = FALSE;
impl->show_hidden = FALSE;
impl->show_size_column = TRUE;
impl->list_icon_size = FALLBACK_LIST_VIEW_ICON_SIZE;
impl->icon_icon_size = FALLBACK_ICON_VIEW_ICON_SIZE;
impl->icon_size_for_list_view = FALLBACK_ICON_SIZE_FOR_LIST_VIEW;
impl->icon_size_for_icon_view = FALLBACK_ICON_SIZE_FOR_ICON_VIEW;
impl->load_state = LOAD_EMPTY;
impl->reload_state = RELOAD_EMPTY;
impl->pending_select_files = NULL;
Expand Down Expand Up @@ -1202,7 +1202,7 @@ render_recent_icon (GtkFileChooserDefault *impl)
theme = gtk_icon_theme_get_default ();

retval = gtk_icon_theme_load_icon (theme, "document-open-recent",
impl->list_icon_size, 0,
impl->icon_size_for_list_view, 0,
NULL);

/* fallback */
Expand Down Expand Up @@ -1240,7 +1240,7 @@ shortcuts_reload_icons_get_info_cb (GCancellable *cancellable,
if (cancelled || error)
goto out;

pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->impl), data->impl->list_icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->impl), data->impl->icon_size_for_list_view);

path = gtk_tree_row_reference_get_path (data->row_ref);
if (path)
Expand Down Expand Up @@ -1304,7 +1304,7 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)

volume = data;
pixbuf = _gtk_file_system_volume_render_icon (volume, GTK_WIDGET (impl),
impl->list_icon_size, NULL);
impl->icon_size_for_list_view, NULL);
}
else if (shortcut_type == SHORTCUT_TYPE_FILE)
{
Expand Down Expand Up @@ -1340,7 +1340,7 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
*/
icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
impl->list_icon_size, 0, NULL);
impl->icon_size_for_list_view, 0, NULL);
}
}
else if (shortcut_type == SHORTCUT_TYPE_SEARCH)
Expand Down Expand Up @@ -1545,7 +1545,7 @@ get_file_info_finished (GCancellable *cancellable,
if (!request->label_copy)
request->label_copy = g_strdup (g_file_info_get_display_name (info));
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
request->impl->list_icon_size);
request->impl->icon_size_for_list_view);

gtk_list_store_set (request->impl->shortcuts_model, &iter,
SHORTCUTS_COL_PIXBUF, pixbuf,
Expand Down Expand Up @@ -1679,7 +1679,7 @@ shortcuts_insert_file (GtkFileChooserDefault *impl,
data = volume;
label_copy = _gtk_file_system_volume_get_display_name (volume);
pixbuf = _gtk_file_system_volume_render_icon (volume, GTK_WIDGET (impl),
impl->list_icon_size, NULL);
impl->icon_size_for_list_view, NULL);
}
else if (shortcut_type == SHORTCUT_TYPE_FILE)
{
Expand Down Expand Up @@ -1738,7 +1738,7 @@ shortcuts_insert_file (GtkFileChooserDefault *impl,
*/
icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
impl->list_icon_size, 0, NULL);
impl->icon_size_for_list_view, 0, NULL);
}
}
else
Expand Down Expand Up @@ -4345,8 +4345,8 @@ set_icon_cell_renderer_fixed_size (GtkFileChooserDefault *impl, GtkCellRenderer

gtk_cell_renderer_get_padding (renderer, &xpad, &ypad);
gtk_cell_renderer_set_fixed_size (renderer,
xpad * 2 + impl->list_icon_size,
ypad * 2 + impl->list_icon_size);
xpad * 2 + impl->icon_size_for_list_view,
ypad * 2 + impl->icon_size_for_list_view);
}

/* Creates list view */
Expand Down Expand Up @@ -5815,14 +5815,14 @@ change_icon_theme (GtkFileChooserDefault *impl)
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));

if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &width, &height))
impl->list_icon_size = MAX (width, height);
impl->icon_size_for_list_view = MAX (width, height);
else
impl->list_icon_size = FALLBACK_LIST_VIEW_ICON_SIZE;
impl->icon_size_for_list_view = FALLBACK_ICON_SIZE_FOR_LIST_VIEW;

if (gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_DIALOG, &width, &height))
impl->icon_icon_size = MAX (width, height);
impl->icon_size_for_icon_view = MAX (width, height);
else
impl->icon_icon_size = FALLBACK_ICON_VIEW_ICON_SIZE;
impl->icon_size_for_icon_view = FALLBACK_ICON_SIZE_FOR_ICON_VIEW;

shortcuts_reload_icons (impl);
/* the first cell in the first column is the icon column, and we have a fixed size there */
Expand Down Expand Up @@ -6795,9 +6795,9 @@ file_system_model_set (GtkFileSystemModel *model,
gint icon_size;

if (column == MODEL_COL_ICON_PIXBUF)
icon_size = impl->icon_icon_size;
icon_size = impl->icon_size_for_icon_view;
else
icon_size = impl->list_icon_size;
icon_size = impl->icon_size_for_list_view;

g_value_take_object (value, _gtk_file_info_render_icon (info, GTK_WIDGET (impl), icon_size));
return TRUE;
Expand Down
4 changes: 2 additions & 2 deletions gtk/gtkfilechooserprivate.h
View file
Open in desktop
Expand Up @@ -283,8 +283,8 @@ struct _GtkFileChooserDefault
char *edited_new_text;

gulong settings_signal_id;
int list_icon_size;
int icon_icon_size;
int icon_size_for_list_view;
int icon_size_for_icon_view;

GSource *focus_entry_idle;

Expand Down