Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

minibrowser: fix spurious update when location has not changed (#30309)

Browse source 
* minibrowser: fix spurious update when location has not changed

* refactor logic in update_location_in_toolbar
This commit is contained in:
Delan Azabani 2023-09-07 17:09:12 +08:00 • committed by GitHub
parent 523e897138
commit 7336aab710
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ports/servoshell/app.rs
View file

@ -91,7 +91,7 @@ impl App {
}
if let Some(mut minibrowser) = app.minibrowser() {
minibrowser.update(window.winit_window().unwrap());
minibrowser.update(window.winit_window().unwrap(), "init");
window.set_toolbar_height(minibrowser.toolbar_height.get());
}
@ -151,7 +151,7 @@ impl App {
// winit::event::Event::RedrawEventsCleared => todo!(),
winit::event::Event::RedrawRequested(_) => {
if let Some(mut minibrowser) = app.minibrowser() {
minibrowser.update(window.winit_window().unwrap());
minibrowser.update(window.winit_window().unwrap(), "RedrawRequested");
// Tell Servo to repaint, which will in turn allow us to repaint the
// minibrowser and present a complete frame without partial updates.
@ -204,7 +204,7 @@ impl App {
if minibrowser.update_location_in_toolbar(browser) {
// Update the minibrowser immediately. While we could update by requesting a
// redraw, doing so would delay the location update by two frames.
minibrowser.update(window.winit_window().unwrap());
minibrowser.update(window.winit_window().unwrap(), "update_location_in_toolbar");
}
}

31
ports/servoshell/minibrowser.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use std::{cell::{RefCell, Cell}, sync::Arc};
use std::{cell::{RefCell, Cell}, sync::Arc, time::Instant};
use egui::{TopBottomPanel, Modifiers, Key};
use servo::{servo_url::ServoUrl, compositing::windowing::EmbedderEvent};
@ -14,6 +14,7 @@ pub struct Minibrowser {
pub context: EguiGlow,
pub event_queue: RefCell<Vec<MinibrowserEvent>>,
pub toolbar_height: Cell<f32>,
last_update: Instant,
location: RefCell<String>,
/// Whether the location has been edited by the user without clicking Go.
@ -37,14 +38,17 @@ impl Minibrowser {
context: EguiGlow::new(events_loop.as_winit(), Arc::new(gl), None),
event_queue: RefCell::new(vec![]),
toolbar_height: 0f32.into(),
last_update: Instant::now(),
location: RefCell::new(String::default()),
location_dirty: false.into(),
}
}
/// Update the minibrowser, but don’t paint.
pub fn update(&mut self, window: &winit::window::Window) {
let Self { context, event_queue, location, location_dirty, toolbar_height } = self;
pub fn update(&mut self, window: &winit::window::Window, reason: &'static str) {
let now = Instant::now();
trace!("{:?} since last update ({})", now - self.last_update, reason);
let Self { context, event_queue, toolbar_height, last_update, location, location_dirty } = self;
let _duration = context.run(window, |ctx| {
TopBottomPanel::top("toolbar").show(ctx, |ui| {
ui.allocate_ui_with_layout(
@ -75,6 +79,7 @@ impl Minibrowser {
});
toolbar_height.set(ctx.used_rect().height());
*last_update = now;
});
}
@ -104,16 +109,20 @@ impl Minibrowser {
}
}
/// Updates the location field when the [Browser] says it has changed, unless the user has
/// started editing it without clicking Go.
/// Updates the location field from the given [Browser], unless the user has started editing it
/// without clicking Go, returning true iff the location has changed (needing an egui update).
pub fn update_location_in_toolbar(&mut self, browser: &mut Browser<dyn WindowPortsMethods>) -> bool {
if !self.location_dirty.get() {
if let Some(location) = browser.current_url_string() {
self.location = RefCell::new(location.to_owned());
return true;
}
// User edited without clicking Go?
if self.location_dirty.get() {
return false;
}
false
match browser.current_url_string() {
Some(location) if location != self.location.get_mut() => {
self.location = RefCell::new(location.to_owned());
true
},
_ => false,
}
}
}