AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

filechooser: Check that icons exist

Browse Source 
Otherwise we end up showing missing-image in the
file chooser, and thats sad.
This commit is contained in:
Matthias Clasen 2021-03-26 13:15:19 -04:00
parent 5940de98dd
commit 23cb72875d
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkfilechooserutils.c
View File

@ -447,9 +447,10 @@ _gtk_file_consider_as_remote (GFile *file)
}
GIcon *
_gtk_file_info_get_icon (GFileInfo *info,
int icon_size,
int scale)
_gtk_file_info_get_icon (GFileInfo *info,
int icon_size,
int scale,
GtkIconTheme *icon_theme)
{
GIcon *icon;
GdkPixbuf *pixbuf;
@ -468,7 +469,7 @@ _gtk_file_info_get_icon (GFileInfo *info,
}
icon = g_file_info_get_icon (info);
if (icon)
if (icon && gtk_icon_theme_has_gicon (icon_theme, icon))
return g_object_ref (icon);
/* Use general fallback for all files without icon */

8
gtk/gtkfilechooserutils.h
View File

@ -21,6 +21,7 @@
#define __GTK_FILE_CHOOSER_UTILS_H__
#include "gtkfilechooserprivate.h"
#include "gtkicontheme.h"
G_BEGIN_DECLS
@ -52,9 +53,10 @@ char * _gtk_file_chooser_label_for_file (GFile *file);
gboolean _gtk_file_info_consider_as_directory (GFileInfo *info);
gboolean _gtk_file_has_native_path (GFile *file);
gboolean _gtk_file_consider_as_remote (GFile *file);
GIcon * _gtk_file_info_get_icon (GFileInfo *info,
int icon_size,
int scale);
GIcon * _gtk_file_info_get_icon (GFileInfo *info,
int icon_size,
int scale,
GtkIconTheme *icon_theme);
G_END_DECLS

8
gtk/gtkfilechooserwidget.c
View File

@ -4448,7 +4448,13 @@ file_system_model_set (GtkFileSystemModel *model,
{
if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_ICON))
{
g_value_take_object (value, _gtk_file_info_get_icon (info, ICON_SIZE, gtk_widget_get_scale_factor (GTK_WIDGET (impl))));
int scale;
GtkIconTheme *icon_theme;
scale = gtk_widget_get_scale_factor (GTK_WIDGET (impl));
icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (impl)));
g_value_take_object (value, _gtk_file_info_get_icon (info, ICON_SIZE, scale, icon_theme));
}
else
{