Show default file widget if Pixbuf can't display Image inline

fixes #713
This commit is contained in:
fiaxh 2020-01-13 03:00:15 +01:00
parent 3fc9bdab05
commit ab4ca27b1e

View file

@ -55,15 +55,16 @@ public class FileWidget : Box {
} }
private async Widget? get_image_widget(FileTransfer file_transfer) { private async Widget? get_image_widget(FileTransfer file_transfer) {
// Load and prepare image in tread
Thread<Image?> thread = new Thread<Image?> (null, () => {
Image image = new Image() { halign=Align.START, visible = true }; Image image = new Image() { halign=Align.START, visible = true };
// Load, scale and set the image
new Thread<void*> (null, () => {
Gdk.Pixbuf pixbuf; Gdk.Pixbuf pixbuf;
try { try {
pixbuf = new Gdk.Pixbuf.from_file(file_transfer.get_file().get_path()); pixbuf = new Gdk.Pixbuf.from_file(file_transfer.get_file().get_path());
} catch (Error error) { } catch (Error error) {
warning("Can't load picture %s", file_transfer.get_file().get_path()); warning("Can't load picture %s - %s", file_transfer.get_file().get_path(), error.message);
Idle.add(get_image_widget.callback);
return null; return null;
} }
@ -81,9 +82,11 @@ public class FileWidget : Box {
Util.image_set_from_scaled_pixbuf(image, pixbuf); Util.image_set_from_scaled_pixbuf(image, pixbuf);
Idle.add(get_image_widget.callback); Idle.add(get_image_widget.callback);
return null; return image;
}); });
yield; yield;
Image image = thread.join();
if (image == null) return null;
Util.force_css(image, "* { box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.1); margin: 2px; border-radius: 3px; }"); Util.force_css(image, "* { box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.1); margin: 2px; border-radius: 3px; }");