colin/SwayNotificationCenter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add border-radius property to notification images (#353)

Browse Source
This commit is contained in:
Erik Reider
2023-12-15 01:04:49 +01:00
committed by GitHub
parent 2d87e22906
commit 929d0d54b7
4 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/style/style.scss
View File

@@ -98,6 +98,7 @@
.image { .image {
/* Notification Primary Image */ /* Notification Primary Image */
-gtk-icon-effect: none; -gtk-icon-effect: none;
border-radius: 10px; /* Size in px */
} }
.summary { .summary {
/* Notification summary/title */ /* Notification summary/title */

6
src/controlCenter/widgets/mpris/mpris_player.vala
View File

@@ -262,11 +262,15 @@ namespace SwayNotificationCenter.Widgets.Mpris {
source.media_player.identity); source.media_player.identity);
} }
if (pixbuf != null) { if (pixbuf != null) {
pixbuf = Functions.scale_round_pixbuf (pixbuf, var surface = Functions.scale_round_pixbuf (pixbuf,
mpris_config.image_size, mpris_config.image_size,
mpris_config.image_size, mpris_config.image_size,
scale, scale,
mpris_config.image_radius); mpris_config.image_radius);
pixbuf = Gdk.pixbuf_get_from_surface (surface,
0, 0,
mpris_config.image_size,
mpris_config.image_size);
album_art.set_from_pixbuf (pixbuf); album_art.set_from_pixbuf (pixbuf);
album_art.get_style_context ().set_scale (1); album_art.get_style_context ().set_scale (1);
return; return;

43
src/functions.vala
View File

@@ -17,21 +17,19 @@ namespace SwayNotificationCenter {
public static void set_image_path (owned string path, public static void set_image_path (owned string path,
Gtk.Image img, Gtk.Image img,
int icon_size, int icon_size,
int radius,
bool file_exists) { bool file_exists) {
if ((path.length > 6 && path.slice (0, 7) == "file://") || file_exists) { if ((path.length > 6 && path.slice (0, 7) == "file://") || file_exists) {
// Try as a URI (file:// is the only URI schema supported right now) // Try as a URI (file:// is the only URI schema supported right now)
try { try {
if (!file_exists) path = path.slice (7, path.length); if (!file_exists) path = path.slice (7, path.length);
var pixbuf = new Gdk.Pixbuf.from_file_at_scale ( var pixbuf = new Gdk.Pixbuf.from_file (path);
path, var surface = scale_round_pixbuf (pixbuf,
icon_size * img.scale_factor, icon_size,
icon_size * img.scale_factor, icon_size,
true); img.scale_factor,
var surface = Gdk.cairo_surface_create_from_pixbuf ( radius);
pixbuf,
img.scale_factor,
img.get_window ());
img.set_from_surface (surface); img.set_from_surface (surface);
return; return;
} catch (Error e) { } catch (Error e) {
@@ -43,7 +41,10 @@ namespace SwayNotificationCenter {
} }
} }
public static void set_image_data (ImageData data, Gtk.Image img, int icon_size) { public static void set_image_data (ImageData data,
Gtk.Image img,
int icon_size,
int radius) {
// Rebuild and scale the image // Rebuild and scale the image
var pixbuf = new Gdk.Pixbuf.with_unowned_data (data.data, var pixbuf = new Gdk.Pixbuf.with_unowned_data (data.data,
Gdk.Colorspace.RGB, Gdk.Colorspace.RGB,
@@ -54,14 +55,11 @@ namespace SwayNotificationCenter {
data.rowstride, data.rowstride,
null); null);
pixbuf = pixbuf.scale_simple ( var surface = scale_round_pixbuf (pixbuf,
icon_size * img.scale_factor, icon_size,
icon_size * img.scale_factor, icon_size,
Gdk.InterpType.BILINEAR); img.scale_factor,
var surface = Gdk.cairo_surface_create_from_pixbuf ( radius);
pixbuf,
img.scale_factor,
img.get_window ());
img.set_from_surface (surface); img.set_from_surface (surface);
} }
@@ -212,11 +210,14 @@ namespace SwayNotificationCenter {
} }
/** Scales the pixbuf to fit the given dimensions */ /** Scales the pixbuf to fit the given dimensions */
public static Gdk.Pixbuf scale_round_pixbuf (Gdk.Pixbuf pixbuf, public static Cairo.Surface scale_round_pixbuf (Gdk.Pixbuf pixbuf,
int buffer_width, int buffer_width,
int buffer_height, int buffer_height,
int img_scale, int img_scale,
int radius) { int radius) {
// Limit radii size
radius = int.min (radius, int.min (buffer_width / 2, buffer_height / 2));
Cairo.Surface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, Cairo.Surface surface = new Cairo.ImageSurface (Cairo.Format.ARGB32,
buffer_width, buffer_width,
buffer_height); buffer_height);
@@ -230,7 +231,7 @@ namespace SwayNotificationCenter {
cr.arc (radius, buffer_height - radius, radius, 90 * DEGREES, 180 * DEGREES); cr.arc (radius, buffer_height - radius, radius, 90 * DEGREES, 180 * DEGREES);
cr.arc (radius, radius, radius, 180 * DEGREES, 270 * DEGREES); cr.arc (radius, radius, radius, 180 * DEGREES, 270 * DEGREES);
cr.close_path (); cr.close_path ();
cr.set_source_rgb (0, 0, 0); cr.set_source_rgba (0, 0, 0, 0);
cr.clip (); cr.clip ();
cr.paint (); cr.paint ();
@@ -261,7 +262,7 @@ namespace SwayNotificationCenter {
cr.restore (); cr.restore ();
scale_surf.finish (); scale_surf.finish ();
return Gdk.pixbuf_get_from_surface (surface, 0, 0, buffer_width, buffer_height); return surface;
} }
private static void draw_scale_tall (int buffer_width, private static void draw_scale_tall (int buffer_width,

15
src/notification/notification.vala
View File

@@ -668,22 +668,33 @@ namespace SwayNotificationCenter {
var app_icon_exists = File.new_for_path ( var app_icon_exists = File.new_for_path (
param.app_icon ?? "").query_exists (); param.app_icon ?? "").query_exists ();
// Get the image CSS corner radius in pixels
int radius = 0;
unowned var ctx = img.get_style_context ();
var value = ctx.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS,
ctx.get_state ());
if (value.type () == Type.INT) {
radius = value.get_int ();
}
if (param.image_data.is_initialized) { if (param.image_data.is_initialized) {
Functions.set_image_data (param.image_data, img, Functions.set_image_data (param.image_data, img,
notification_icon_size); notification_icon_size, radius);
} else if (param.image_path != null && } else if (param.image_path != null &&
param.image_path != "" && param.image_path != "" &&
img_path_exists) { img_path_exists) {
Functions.set_image_path (param.image_path, img, Functions.set_image_path (param.image_path, img,
notification_icon_size, notification_icon_size,
radius,
img_path_exists); img_path_exists);
} else if (param.app_icon != null && param.app_icon != "") { } else if (param.app_icon != null && param.app_icon != "") {
Functions.set_image_path (param.app_icon, img, Functions.set_image_path (param.app_icon, img,
notification_icon_size, notification_icon_size,
radius,
app_icon_exists); app_icon_exists);
} else if (param.icon_data.is_initialized) { } else if (param.icon_data.is_initialized) {
Functions.set_image_data (param.icon_data, img, Functions.set_image_data (param.icon_data, img,
notification_icon_size); notification_icon_size, radius);
} }
if (img.storage_type == Gtk.ImageType.EMPTY) { if (img.storage_type == Gtk.ImageType.EMPTY) {