lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify async code

Browse source 
- Update Cargo.lock
- Use new gtk-core API
- Remove unneeded async
- Remove unneeded clones

Part-of: <https://gitlab.gnome.org/GNOME/loupe/-/merge_requests/310>
This commit is contained in:
Julian Hofer 2023-11-22 09:12:07 +01:00
parent 8d185e1e10
commit cd8188a1bb
10 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/widgets/image.rs
View file

@ -36,7 +36,6 @@ use crate::decoder::{self, tiling, Decoder, DecoderUpdate};
use crate::image_metadata::LpImageMetadata;
use crate::util::Gesture;
use crate::util::spawn;
use adw::{prelude::*, subclass::prelude::*};
use arc_swap::ArcSwap;
use futures::prelude::*;
@ -297,7 +296,7 @@ mod imp {
});
adw::StyleManager::default().connect_dark_notify(glib::clone!(@weak obj => move |_| {
spawn(async move {
glib::spawn_future_local(async move {
let color = obj.background_color_guess().await;
obj.set_background_color(color);
if obj.is_mapped() {
@ -778,7 +777,7 @@ impl LpImage {
let (decoder, mut decoder_update) = Decoder::new(file.clone(), tiles.clone()).await;
let weak_obj = self.downgrade();
spawn(async move {
glib::spawn_future_local(async move {
while let Some(update) = decoder_update.next().await {
if let Some(obj) = weak_obj.upgrade() {
obj.update(update);
@ -819,7 +818,7 @@ impl LpImage {
new_tiles
});
if imp.background_color.borrow().is_none() {
spawn(glib::clone!(@weak self as obj => async move {
glib::spawn_future_local(glib::clone!(@weak self as obj => async move {
let color = obj.background_color_guess().await;
obj.set_background_color(color);
if obj.is_mapped() {
@ -971,7 +970,7 @@ impl LpImage {
log::debug!("Image got replaced {}", file.uri());
let obj = self.clone();
// TODO: error handling is missing
spawn(async move {
glib::spawn_future_local(async move {
obj.load(&file).await;
});
}
@ -982,7 +981,7 @@ impl LpImage {
let file = file_a.clone();
log::debug!("Image was edited {}", file.uri());
// TODO: error handling is missing
spawn(async move {
glib::spawn_future_local(async move {
obj.load(&file).await;
});
}