Skip to content

browser: Virtualize sidebar tab list and pre-collect tab render data #57

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

Open
Yabuku-xD wants to merge 2 commits into
base: main
Choose a base branch
from
Open

browser: Virtualize sidebar tab list and pre-collect tab render data #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e32496a
browser: Reduce spurious rendering and lock contention
Yabuku-xD Apr 21, 2026
66efada
browser: Virtualize sidebar tab list and pre-collect tab render data
Yabuku-xD Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 32 additions & 21 deletions crates/browser/src/browser_view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ use gpui::{
InteractiveElement, IntoElement, ParentElement, Pixels, Render, SharedString, Styled,
Subscription, Task, UTF16Selection, WeakEntity, Window, actions, div, point, prelude::*, size,
};
#[cfg(not(target_os = "macos"))]
use gpui::UniformListScrollHandle;
use std::ops::Range;
use std::sync::atomic::{AtomicBool, Ordering};
use workspace::{
Expand Down Expand Up @@ -213,6 +215,8 @@ pub struct BrowserView {
#[cfg(not(target_os = "macos"))]
sidebar_collapsed: bool,
sidebar_visible: bool,
#[cfg(not(target_os = "macos"))]
sidebar_scroll_handle: UniformListScrollHandle,
native_sidebar_panel: Option<Entity<tab_strip::BrowserSidebarPanel>>,
focus_listeners_registered: bool,
toast_layer: Entity<toast::ToastLayer>,
Expand Down Expand Up @@ -309,6 +313,8 @@ impl BrowserView {
#[cfg(not(target_os = "macos"))]
sidebar_collapsed: false,
sidebar_visible: false,
#[cfg(not(target_os = "macos"))]
sidebar_scroll_handle: UniformListScrollHandle::default(),
native_sidebar_panel: None,
focus_listeners_registered: false,
toast_layer,
Expand Down Expand Up @@ -848,7 +854,9 @@ impl BrowserView {
match event {
#[cfg(target_os = "macos")]
TabEvent::FrameReady => {
cx.notify();
if self.surface_state == BrowserSurfaceState::Visible {
cx.notify();
}
}
TabEvent::NavigateToUrl(url) => {
let url = url.clone();
Expand Down Expand Up @@ -1493,26 +1501,29 @@ impl Render for BrowserView {
.into_any_element();

#[cfg(not(target_os = "macos"))]
let element = match self.tab_bar_mode {
TabBarMode::Horizontal => element
.flex_col()
.child(div().mt(px(-1.)).child(self.render_tab_strip(cx)))
.child(self.bookmark_bar.clone())
.child(self.render_browser_content(window, cx))
.into_any_element(),
TabBarMode::Sidebar => element
.flex_row()
.child(self.render_sidebar(cx))
.child(
div()
.flex_1()
.flex()
.flex_col()
.overflow_hidden()
.child(self.bookmark_bar.clone())
.child(self.render_browser_content(window, cx)),
)
.into_any_element(),
let element = {
let pinned_count = self.pinned_tab_count(cx);
match self.tab_bar_mode {
TabBarMode::Horizontal => element
.flex_col()
.child(div().mt(px(-1.)).child(self.render_tab_strip(pinned_count, cx)))
.child(self.bookmark_bar.clone())
.child(self.render_browser_content(window, cx))
.into_any_element(),
TabBarMode::Sidebar => element
.flex_row()
.child(self.render_sidebar(pinned_count, cx))
.child(
div()
.flex_1()
.flex()
.flex_col()
.overflow_hidden()
.child(self.bookmark_bar.clone())
.child(self.render_browser_content(window, cx)),
)
.into_any_element(),
}
};

div()
Expand Down
Loading
Loading