YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-08-31 08:52:14 +00:00
Code Issues Projects Releases Wiki Activity

switch the loading widget only when this action is required by timeout (prevents background blinks on page reload)

Browse Source
This commit is contained in:
yggverse 2025-06-26 20:16:22 +03:00
parent dad58098f3
commit 6a3ee89d8b
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/browser/window/tab/item/client/driver/nex.rs
View File

@ -12,7 +12,7 @@ use gtk::{
glib::{Priority, Uri}, glib::{Priority, Uri},
}; };
use sourceview::prelude::FileExt; use sourceview::prelude::FileExt;
use std::{rc::Rc, time::Duration}; use std::{cell::RefCell, rc::Rc};
pub struct Nex { pub struct Nex {
page: Rc<Page>, page: Rc<Page>,
@ -104,18 +104,21 @@ impl Nex {
Some(&cancellable.clone()), Some(&cancellable.clone()),
move |r| match r { move |r| match r {
Ok(_) => { Ok(_) => {
// Is download feature request // Is download feature request,
// delegate this task to the separated handler function.
if matches!(*feature, Feature::Download) { if matches!(*feature, Feature::Download) {
return download(c.upcast::<IOStream>(), (p, uri), cancellable); return download(c.upcast::<IOStream>(), (p, uri), cancellable);
} }
// Handle renderable types.. // Is renderable types..
// Show loading status if handle time > 1 second
let status = // Show loading status page if awaiting time > 1 second
p.content.to_status_loading(Some(Duration::from_secs(1))); // * the RefCell is just to not init the loading widget before timeout and prevent bg blinks
let loading: RefCell<Option<adw::StatusPage>> = RefCell::new(None);
// Nex is the header-less protocol, final content size is never known, // Nex is the header-less protocol, final content size is never known,
// borrow ggemini::gio wrapper api to preload it safely by chunks // borrow ggemini::gio wrapper api to preload the buffer swap-safely,
// by using the chunks controller.
ggemini::gio::memory_input_stream::from_stream_async( ggemini::gio::memory_input_stream::from_stream_async(
c.upcast::<IOStream>(), c.upcast::<IOStream>(),
Priority::DEFAULT, Priority::DEFAULT,
@ -126,10 +129,21 @@ impl Nex {
total: 0, // initial totals total: 0, // initial totals
}, },
( (
move |_, t| { {
status.set_description(Some(&format!( let p = p.clone();
"Preload: {t} bytes" move |_, t| {
))) let mut l = loading.borrow_mut();
match *l {
Some(ref this) => this.set_description(Some(
&format!("Preload: {t} bytes"),
)),
None => {
l.replace(p.content.to_status_loading(
Some(std::time::Duration::from_secs(1)),
));
}
}
}
}, },
move |r| match r { move |r| match r {
Ok((m, s)) => { Ok((m, s)) => {