zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 23:01:04 +02:00
Code Activity

refactor: take reference into image provider

Browse source
This commit is contained in:
Jake Stanger 2024-06-28 23:26:36 +01:00
parent df4bfc83d0
commit cc6f21ed68
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
7 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/image/gtk.rs
View file

@ -13,7 +13,7 @@ pub fn new_icon_button(input: &str, icon_theme: &IconTheme, size: i32) -> Button
image.add_class("icon");
match ImageProvider::parse(input, icon_theme, false, size)
.map(|provider| provider.load_into_image(image.clone()))
.map(|provider| provider.load_into_image(&image))
{
Some(_) => {
button.set_image(Some(&image));
@ -42,7 +42,7 @@ pub fn new_icon_label(input: &str, icon_theme: &IconTheme, size: i32) -> gtk::Bo
container.add(&image);
ImageProvider::parse(input, icon_theme, false, size)
.map(|provider| provider.load_into_image(image));
.map(|provider| provider.load_into_image(&image));
} else {
let label = Label::builder().use_markup(true).label(input).build();
label.add_class("icon");

7
src/image/provider.rs
View file

@ -141,7 +141,7 @@ impl<'a> ImageProvider<'a> {
/// Attempts to fetch the image from the location
/// and load it into the provided `GTK::Image` widget.
pub fn load_into_image(&self, image: gtk::Image) -> Result<()> {
pub fn load_into_image(&self, image: &gtk::Image) -> Result<()> {
// handle remote locations async to avoid blocking UI thread while downloading
#[cfg(feature = "http")]
if let ImageLocation::Remote(url) = &self.location {
@ -157,6 +157,7 @@ impl<'a> ImageProvider<'a> {
{
let size = self.size;
let image = image.clone();
glib_recv_mpsc!(rx, bytes => {
let stream = MemoryInputStream::from_bytes(&bytes);
@ -181,11 +182,11 @@ impl<'a> ImageProvider<'a> {
});
}
} else {
self.load_into_image_sync(&image)?;
self.load_into_image_sync(image)?;
};
#[cfg(not(feature = "http"))]
self.load_into_image_sync(&image)?;
self.load_into_image_sync(image)?;
Ok(())
}