Skip to content

OperatingSystemView: use Gtk.Picture instead of Adw.Avatar #311

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

Draft
danirabbit wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

OperatingSystemView: use Gtk.Picture instead of Adw.Avatar #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a87a7f
OperatingSystemView: use Gtk.Picture instead of Adw.Avatar
danirabbit Feb 21, 2024
2d1322e
Merge branch 'main' into danirabbit/osview-gtkpicture
jeremypw Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions data/OperatingSystemView.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@
);
border-radius: 100%;
box-shadow:
inset 0 -2px 0 0 alpha(@highlight_color, 0.2),
inset 0 2px 0 0 alpha(@highlight_color, 0.3),
inset 2px 0 0 0 alpha(@highlight_color, 0.07),
inset -2px 0 0 0 alpha(@highlight_color, 0.07),
inset 0 0 0 1px alpha(black, 0.7);
inset 0 -1px 0 0 alpha(@highlight_color, 0.2),
inset 0 1px 0 0 alpha(@highlight_color, 0.3),
inset 1px 0 0 0 alpha(@highlight_color, 0.07),
inset -1px 0 0 0 alpha(@highlight_color, 0.07);
-gtk-icon-shadow:
0 1px 1px alpha(black, 0.3),
0 2px 3px alpha(@accent_color_900, 0.2);
-gtk-icon-style: symbolic;
}

picture {
background: #333;
box-shadow:
0 0 0 1px alpha(black, 0.7),
0 1px 3px alpha(black, 0.12),
0 1px 2px alpha(black, 0.24);
border-radius: 100%;
min-height: 128px;
min-width: 128px;
}
17 changes: 11 additions & 6 deletions src/Views/OperatingSystemView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class About.OperatingSystemView : Gtk.Box {

private string support_url;
private File? logo_file;
private Adw.Avatar? logo;
private Gtk.Picture? logo;
private Gtk.StringList packages;
private SystemUpdate? update_proxy = null;
private SystemUpdate.CurrentState? current_state = null;
Expand Down Expand Up @@ -55,6 +55,7 @@ public class About.OperatingSystemView : Gtk.Box {
};

var logo_overlay = new Gtk.Overlay () {
halign = END,
valign = START
};

Expand All @@ -66,12 +67,17 @@ public class About.OperatingSystemView : Gtk.Box {

if (file.query_exists ()) {
logo_file = file;
logo = new Adw.Avatar (128, "", false) {
custom_image = Gdk.Paintable.empty (128, 128)
logo = new Gtk.Picture () {
content_fit = COVER
};
logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);

logo_overlay.child = logo;
var clamp = new Adw.Clamp () {
child = logo,
maximum_size = 128
};

logo_overlay.child = clamp;
logo_overlay.add_overlay (icon);

// 128 minus 3px padding on each side
Expand Down Expand Up @@ -326,8 +332,7 @@ public class About.OperatingSystemView : Gtk.Box {
}

try {
var bytes = yield logo_file.load_bytes_async (null, null);
logo.custom_image = Gdk.Texture.from_bytes (bytes);
logo.file = logo_file;
logo_file = null;
} catch (Error e) {
warning ("Failed to load logo file: %s", e.message);
Expand Down