gtk-adwaita: Loading and error state for Artwork widget

Changes

3 changed files (+39/-0)

• gtk-adwaita/data/gresource.xml
  • @@ -30,6 +30,7 @@ <file preprocess="xml-stripblanks">ui/server-list-unexpected-error-dialog.ui</file>
    <file preprocess="xml-stripblanks">ui/server-list-network-error-dialog.ui</file> <file preprocess="xml-stripblanks">icons/scalable/actions/go-next-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/go-previous-symbolic.svg</file> + <file preprocess="xml-stripblanks">icons/scalable/actions/image-missing-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/item-missing-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/library-music-symbolic.svg</file> <file preprocess="xml-stripblanks">icons/scalable/actions/pause-large-symbolic.svg</file>
• gtk-adwaita/data/icons/scalable/actions/image-missing-symbolic.svg (new)
  • @@ -0,0 +1,8 @@
    + <?xml version="1.0" encoding="UTF-8"?> + <!-- + SPDX-FileCopyrightText: Gnome Developers + SPDX-License-Identifier: CC0-1.0 + --> + <svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg"> + <path d="m 4 1 c -1.644531 0 -3 1.355469 -3 3 v 1 h 1 v -1 c 0 -1.109375 0.890625 -2 2 -2 h 1 v -1 z m 2 0 v 1 h 4 v -1 z m 5 0 v 1 h 1 c 1.109375 0 2 0.890625 2 2 v 1 h 1 v -1 c 0 -1.644531 -1.355469 -3 -3 -3 z m -5 4 c -0.550781 0 -1 0.449219 -1 1 s 0.449219 1 1 1 s 1 -0.449219 1 -1 s -0.449219 -1 -1 -1 z m -5 1 v 4 h 1 v -4 z m 13 0 v 4 h 1 v -4 z m -4.5 2 l -2 2 l -1.5 -1 l -2 2 v 0.5 c 0 0.5 0.5 0.5 0.5 0.5 h 7 s 0.472656 -0.035156 0.5 -0.5 v -1 z m -8.5 3 v 1 c 0 1.644531 1.355469 3 3 3 h 1 v -1 h -1 c -1.109375 0 -2 -0.890625 -2 -2 v -1 z m 13 0 v 1 c 0 1.109375 -0.890625 2 -2 2 h -1 v 1 h 1 c 1.644531 0 3 -1.355469 3 -3 v -1 z m -8 3 v 1 h 4 v -1 z m 0 0" fill="#2e3434" fill-opacity="0.34902"/> + </svg>
• gtk-adwaita/src/Widgets/Artwork.vala
  • @@ -59,6 +59,8 @@
    public Plac.Image.ScalingMethod scaling { get; set; default = FIT; } private Gtk.Picture picture = new Gtk.Picture(); + private Adw.Spinner spinner = new Adw.Spinner(); + private Gtk.Image error_icon = new Gtk.Image.from_icon_name("image-missing-symbolic"); public Artwork() { Object();
  • @@ -77,6 +79,22 @@ picture.width_request = _width;
    picture.height_request = _height; picture.content_fit = SCALE_DOWN; picture.add_css_class("plac-playback-artwork"); + picture.visible = false; + + spinner.set_parent(this); + spinner.halign = CENTER; + spinner.valign = CENTER; + spinner.width_request = _width; + spinner.height_request = _height; + spinner.visible = true; + + error_icon.set_parent(this); + error_icon.halign = CENTER; + error_icon.valign = CENTER; + error_icon.width_request = _width; + error_icon.height_request = _height; + error_icon.pixel_size = _width / 2; + error_icon.visible = false; render(); }
  • @@ -87,6 +105,10 @@ if (_conn == null || _image_key == null) {
    return; } + picture.visible = false; + spinner.visible = true; + error_icon.visible = false; + var opts = new Plac.Image.GetOptions(); opts.set_size(scaling, _width, _height); opts.set_content_type(JPEG);
  • @@ -95,16 +117,22 @@ _conn.get_image.begin(_image_key, opts, (obj, res) => {
    var result = _conn.get_image.end(res); if (result == null) { GLib.log("Plac", LEVEL_WARNING, "Failed to download image: Out of memory"); + error_icon.visible = true; + spinner.visible = false; return; } if (result.code != OK) { GLib.log("Plac", LEVEL_WARNING, "Failed to download image: %s", result.code.to_string()); + error_icon.visible = true; + spinner.visible = false; return; } if (result.image == null) { GLib.log("Plac", LEVEL_WARNING, "Failed to download image: image_field_missing"); + error_icon.visible = true; + spinner.visible = false; return; }
  • @@ -112,6 +140,8 @@ var bytes = GLib.Bytes.new_with_owner(result.image.data, result.image);
    try { var texture = Gdk.Texture.from_bytes(bytes); picture.paintable = texture; + spinner.visible = false; + picture.visible = true; } catch (GLib.Error error) { GLib.log("Plac", LEVEL_WARNING, "Failed to generate artwork texture: %s", error.message); }