Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

servoshell: add support for tabbed browsing #31545

Draft
wants to merge 11 commits into
base: multi-tlbc
Choose a base branch
from
Draft

servoshell: add support for tabbed browsing #31545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15031a9
servoshell: add support for tabbed browsing
delan Mar 7, 2024
f6c1a42
Remember focus order in case focused webview is closed
delan Mar 7, 2024
74bac93
Middle-click tabs to close them
delan Mar 7, 2024
51645c5
Tab bar on top, like Firefox and Chrome
delan Mar 7, 2024
15ff904
libservo: don’t send WebViewBlurred when webviews are closed
delan Mar 7, 2024
d02c583
Log tab-related embedder messages for debugging
delan Mar 7, 2024
ce6e868
Add comment about not sending WebViewBlurred on close
delan Mar 7, 2024
1765bf5
Only send Raise and Focus messages if tab not already focused
delan Mar 8, 2024
e846da9
Independent location field for each tab
delan Mar 8, 2024
4752b4b
Make location bar text yellow when dirty
delan Mar 8, 2024
17b2c0d
Independent window title for each tab
delan Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions components/constellation/constellation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3046,14 +3046,12 @@ where
let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id);
let browsing_context =
self.close_browsing_context(browsing_context_id, ExitPipelineMode::Normal);
if self.webviews.focused_webview().map(|(id, _)| id) == Some(top_level_browsing_context_id)
{
self.embedder_proxy
.send((None, EmbedderMsg::WebViewBlurred));
}
self.webviews.remove(top_level_browsing_context_id);
self.compositor_proxy
.send(CompositorMsg::RemoveWebView(top_level_browsing_context_id));

// Notify the embedder that the webview was closed, but don’t notify that it was blurred.
// Let the embedder deduce that, so it can focus another webview if it wants.
self.embedder_proxy.send((
Some(top_level_browsing_context_id),
EmbedderMsg::WebViewClosed(top_level_browsing_context_id),
Expand Down
118 changes: 89 additions & 29 deletions ports/servoshell/minibrowser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::{Cell, RefCell};
use std::cell::RefCell;
use std::num::NonZeroU32;
use std::sync::Arc;
use std::time::Instant;
Expand All @@ -16,7 +16,7 @@ use egui_winit::EventResponse;
use euclid::{Box2D, Length, Point2D, Scale, Size2D};
use gleam::gl;
use glow::NativeFramebuffer;
use log::{trace, warn};
use log::{info, trace, warn};
use servo::compositing::windowing::EmbedderEvent;
use servo::msg::constellation_msg::TraversalDirection;
use servo::rendering_context::RenderingContext;
Expand Down Expand Up @@ -44,9 +44,6 @@ pub struct Minibrowser {
last_mouse_position: Option<Point2D<f32, DeviceIndependentPixel>>,
location: RefCell<String>,

/// Whether the location has been edited by the user without clicking Go.
location_dirty: Cell<bool>,

load_status: LoadStatus,
}

Expand Down Expand Up @@ -88,7 +85,6 @@ impl Minibrowser {
last_update: Instant::now(),
last_mouse_position: None,
location: RefCell::new(initial_url.to_string()),
location_dirty: false.into(),
load_status: LoadStatus::LoadComplete,
}
}
Expand Down Expand Up @@ -145,11 +141,64 @@ impl Minibrowser {
widget_surface_fbo,
last_update,
location,
location_dirty,
..
} = self;
let widget_fbo = *widget_surface_fbo;
let _duration = context.run(window, |ctx| {
let mut embedder_events = vec![];
let focused_webview_id = webviews.focused_webview_id();
let mut selected_tab = focused_webview_id;
TopBottomPanel::top("tab bar").show(ctx, |ui| {
ui.allocate_ui_with_layout(
ui.available_size(),
egui::Layout::left_to_right(egui::Align::Center),
|ui| {
if ui.button("❌").clicked() {
if let Some(webview_id) = focused_webview_id {
embedder_events.push(EmbedderEvent::CloseWebView(webview_id));
}
}

let mut clicked_tab_webview_id = None;
let mut middle_clicked_tab_webview_id = None;
for (&webview_id, _) in webviews.creation_order() {
let text = format!("{:?}", webview_id.0);
let tab =
ui.selectable_value(&mut selected_tab, Some(webview_id), text);
if tab.clicked() {
info!("Clicked tab {webview_id}");
clicked_tab_webview_id = Some(webview_id);
}
if tab.clicked_by(egui::PointerButton::Middle) {
info!("Middle-clicked tab {webview_id}");
middle_clicked_tab_webview_id = Some(webview_id);
}
}
if let Some(clicked_tab_webview_id) = clicked_tab_webview_id {
embedder_events.push(EmbedderEvent::BlurWebView);
embedder_events.push(EmbedderEvent::RaiseWebViewToTop(
clicked_tab_webview_id,
true,
));
embedder_events
.push(EmbedderEvent::FocusWebView(clicked_tab_webview_id));
}
if let Some(webview_id) = middle_clicked_tab_webview_id {
embedder_events.push(EmbedderEvent::CloseWebView(webview_id));
}
},
);
});

let mut location_dirty = false;
let mut location = location.borrow_mut();
if let Some(webview) = webviews.focused_webview_mut() {
location_dirty = webview.location_dirty;
if webview.location != *location {
*location = webview.location.clone();
}
}

TopBottomPanel::top("toolbar").show(ctx, |ui| {
ui.allocate_ui_with_layout(
ui.available_size(),
Expand All @@ -167,7 +216,7 @@ impl Minibrowser {
|ui| {
if ui.button("go").clicked() {
event_queue.borrow_mut().push(MinibrowserEvent::Go);
location_dirty.set(false);
location_dirty = false;
}

match self.load_status {
Expand All @@ -180,13 +229,13 @@ impl Minibrowser {
LoadStatus::LoadComplete => { /* No Spinner */ },
}

let location_field = ui.add_sized(
ui.available_size(),
egui::TextEdit::singleline(&mut *location.borrow_mut()),
);
let location_field = egui::TextEdit::singleline(&mut *location)
.text_color_opt(location_dirty.then_some(Color32::YELLOW));
let location_field =
ui.add_sized(ui.available_size(), location_field);

if location_field.changed() {
location_dirty.set(true);
location_dirty = true;
}
if ui.input(|i| i.clone().consume_key(Modifiers::COMMAND, Key::L)) {
location_field.request_focus();
Expand All @@ -195,7 +244,7 @@ impl Minibrowser {
ui.input(|i| i.clone().key_pressed(Key::Enter))
{
event_queue.borrow_mut().push(MinibrowserEvent::Go);
location_dirty.set(false);
location_dirty = false;
}
},
);
Expand All @@ -208,15 +257,21 @@ impl Minibrowser {
// point, but the Context is correct and the TopBottomPanel is wrong.
*toolbar_height = Length::new(ctx.available_rect().min.y);

let scale =
Scale::<_, DeviceIndependentPixel, DevicePixel>::new(ctx.pixels_per_point());
let Some(focused_webview_id) = webviews.focused_webview_id() else {
if let Some(webview) = webviews.focused_webview_mut() {
webview.location_dirty = location_dirty;
if *location != webview.location {
webview.location = location.clone();
}
}

let Some(focused_webview_id) = focused_webview_id else {
return;
};
let Some(webview) = webviews.get_mut(focused_webview_id) else {
let Some(focused_webview) = webviews.get_mut(focused_webview_id) else {
return;
};
let mut embedder_events = vec![];
let scale =
Scale::<_, DeviceIndependentPixel, DevicePixel>::new(ctx.pixels_per_point());
CentralPanel::default()
.frame(Frame::none())
.show(ctx, |ui| {
Expand All @@ -229,8 +284,8 @@ impl Minibrowser {
Point2D::new(x, y),
Size2D::new(width, height),
) * scale;
if rect != webview.rect {
webview.rect = rect;
if rect != focused_webview.rect {
focused_webview.rect = rect;
embedder_events
.push(EmbedderEvent::MoveResizeWebView(focused_webview_id, rect));
}
Expand Down Expand Up @@ -344,20 +399,25 @@ impl Minibrowser {
/// editing it without clicking Go, returning true iff it has changed (needing an egui update).
pub fn update_location_in_toolbar(
&mut self,
browser: &mut WebViewManager<dyn WindowPortsMethods>,
webviews: &mut WebViewManager<dyn WindowPortsMethods>,
) -> bool {
// If no webview is focused, just return false.
let Some(webview) = webviews.focused_webview_mut() else {
return false;
};

// User edited without clicking Go?
if self.location_dirty.get() {
if dbg!(webview.location_dirty) {
return false;
}

match browser.current_url_string() {
Some(location) if location != self.location.get_mut() => {
self.location = RefCell::new(location.to_owned());
true
},
_ => false,
let new_location = webview.current_url_string.as_deref().unwrap_or("");
if dbg!(new_location) != dbg!(&webview.location) {
webview.location = new_location.to_owned();
return true;
}

false
}

/// Updates the spinner from the given [WebViewManager], returning true iff it has changed
Expand Down