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

make progress fraction value update optional

Browse Source
This commit is contained in:
yggverse 2024-09-29 23:10:54 +03:00
parent a145ea4b6d
commit 46bf3c30ec
3 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/browser/main/tab/page.rs
View File

@ -399,11 +399,12 @@ impl Page {
pub fn update(&self) { pub fn update(&self) {
// Interpret status to progress fraction // Interpret status to progress fraction
let progress_fraction = match self.meta.borrow().status { let progress_fraction = match self.meta.borrow().status {
Some(Status::Prepare) => 0.25, Some(Status::Success) => Some(0.0),
Some(Status::Connect) => 0.50, Some(Status::Prepare) => Some(0.25),
Some(Status::Request) => 0.75, Some(Status::Connect) => Some(0.50),
Some(Status::Response | Status::Success) => 1.0, Some(Status::Request) => Some(0.75),
_ => 0.0, Some(Status::Response) => Some(1.0),
_ => None,
}; };
// Update components // Update components

2
src/browser/main/tab/page/navigation.rs
View File

@ -75,7 +75,7 @@ impl Navigation {
} }
// Actions // Actions
pub fn update(&self, progress_fraction: f64) { pub fn update(&self, progress_fraction: Option<f64>) {
self.base.update(self.request.uri()); self.base.update(self.request.uri());
self.history.update(); self.history.update();
self.reload.update(!self.request.is_empty()); self.reload.update(!self.request.is_empty());

69
src/browser/main/tab/page/navigation/request.rs
View File

@ -60,42 +60,45 @@ impl Request {
} }
// Actions // Actions
pub fn update(&self, progress_fraction: f64) { pub fn update(&self, progress_fraction: Option<f64>) {
// Update shared fraction value for async progressbar animation // Skip Non value
self.progress.fraction.replace(progress_fraction); if let Some(value) = progress_fraction {
// Update shared fraction value for async progressbar animation
self.progress.fraction.replace(value);
// Start new frame on previous process completed only (`source_id` is None) // Start new frame on previous process completed only (`source_id` is None)
// If previous process still active, we have just updated shared fraction value before, to use it inside the active process // If previous process still active, we have just updated shared fraction value before, to use it inside the active process
if self.progress.source_id.borrow().is_none() { if self.progress.source_id.borrow().is_none() {
// Start new animation frame iterator, update `source_id` // Start new animation frame iterator, update `source_id`
self.progress.source_id.replace(Some(timeout_add_local( self.progress.source_id.replace(Some(timeout_add_local(
Duration::from_millis(PROGRESS_ANIMATION_TIME), Duration::from_millis(PROGRESS_ANIMATION_TIME),
{ {
// Clone async pointers dependency // Clone async pointers dependency
let widget = self.widget.clone(); let widget = self.widget.clone();
let progress = self.progress.clone(); let progress = self.progress.clone();
// Frame // Frame
move || { move || {
// Animate // Animate
if *progress.fraction.borrow() > widget.progress_fraction() { if *progress.fraction.borrow() > widget.progress_fraction() {
widget.set_progress_fraction( widget.set_progress_fraction(
// Currently, here is no outrange validation, seems that wrapper make this work @TODO // Currently, here is no outrange validation, seems that wrapper make this work @TODO
widget.progress_fraction() + PROGRESS_ANIMATION_STEP, widget.progress_fraction() + PROGRESS_ANIMATION_STEP,
); );
return ControlFlow::Continue; return ControlFlow::Continue;
}
// Deactivate
progress.source_id.replace(None);
// Reset
widget.set_progress_fraction(0.0);
// Stop iteration
ControlFlow::Break
} }
// Deactivate },
progress.source_id.replace(None); )));
}
// Reset
widget.set_progress_fraction(0.0);
// Stop iteration
ControlFlow::Break
}
},
)));
} }
} }