feat: reveal overflow tabs while holding a native drag at strip edges

This commit is contained in:
2026-10-23 20:32:27 +08:00
parent c9eb498932
commit d86b84800a
3 changed files with 316 additions and 37 deletions
+137 -4
View File
@@ -1,6 +1,7 @@
use std::{
num::NonZeroU32,
sync::{Arc, RwLock},
time::{Duration, Instant},
};
use softbuffer::{Context, Surface};
@@ -8,7 +9,7 @@ use winit::{
application::ApplicationHandler,
dpi::{LogicalPosition, LogicalSize, PhysicalPosition},
event::{ElementState, Ime, MouseButton, MouseScrollDelta, WindowEvent},
event_loop::{ActiveEventLoop, EventLoopProxy},
event_loop::{ActiveEventLoop, ControlFlow, EventLoopProxy},
keyboard::{Key, ModifiersState, NamedKey},
window::{Window, WindowAttributes, WindowId},
};
@@ -29,6 +30,14 @@ pub enum AppEvent {
ConsoleFailed { message: String, source: String },
}
struct TabScrollHover {
window: u64,
session: u64,
point: Point,
direction: i8,
next: Instant,
}
pub struct TesseraApp {
resource: u64,
native_session: u64,
@@ -50,6 +59,8 @@ pub struct TesseraApp {
tab_drag_origin: Option<Point>,
tab_drag_grab: Option<Point>,
tab_drop_index: Option<usize>,
tab_first: Option<usize>,
tab_scroll_hover: Option<TabScrollHover>,
window_order: Vec<u64>,
guest_focus: Option<crate::events::Input>,
guest_key: Option<(NamedKey, crate::events::Input)>,
@@ -88,6 +99,8 @@ impl TesseraApp {
tab_drag_origin: None,
tab_drag_grab: None,
tab_drop_index: None,
tab_first: None,
tab_scroll_hover: None,
window_order: vec![crate::window::MAIN_WINDOW],
guest_focus: None,
guest_key: None,
@@ -285,6 +298,8 @@ impl TesseraApp {
self.tab_drag_origin = None;
self.tab_drag_grab = None;
self.tab_drop_index = None;
self.tab_first = None;
self.tab_scroll_hover = None;
}
self.guest_focus =
frame
@@ -486,7 +501,7 @@ impl TesseraApp {
return None;
}
let width = window.inner_size().width as f32 / window.scale_factor() as f32;
let (id, close) = crate::tabs::hit(&frame.tabs, width, self.pointer)?;
let (id, close) = crate::tabs::hit(self.tab_first, &frame.tabs, width, self.pointer)?;
Some(crate::events::Input {
window: self.resource,
session: frame.session,
@@ -585,6 +600,7 @@ impl TesseraApp {
let window = self.window.as_ref()?;
let current = self.namespace.read().ok()?;
crate::tabs::drag_anchor(
self.tab_first,
&current.document.frame.tabs,
window.inner_size().width as f32 / window.scale_factor() as f32,
input.mount,
@@ -605,6 +621,78 @@ impl TesseraApp {
}
}
fn clear_tab_scroll(&mut self) {
self.tab_scroll_hover = None;
if self.tab_first.take().is_some() {
self.request_redraw();
}
for child in self.children.values_mut() {
child.clear_tab_scroll();
}
}
fn tick_tab_scroll(&mut self, event_loop: &ActiveEventLoop) {
let Some(mut hover) = self.tab_scroll_hover.take() else {
return;
};
let dragging = self.apps().any(|app| {
app.tab_drag_origin.is_some()
&& app.tab_pressed.as_ref().is_some_and(|input| {
input.session == hover.session
&& app.namespace.read().ok().is_some_and(|current| {
let frame = &current.document.frame;
frame.session == input.session
&& frame.fault.is_none()
&& frame.tabs.iter().any(|tab| tab.id == input.mount)
})
})
});
if !dragging {
self.clear_tab_scroll();
return;
}
let now = Instant::now();
if now < hover.next {
event_loop.set_control_flow(ControlFlow::WaitUntil(hover.next));
self.tab_scroll_hover = Some(hover);
return;
}
let target = if self.resource == hover.window {
Some(&mut *self)
} else {
self.children.get_mut(&hover.window)
};
let feedback = target.and_then(|target| {
let window = target.window.as_ref()?;
let width = window.inner_size().width as f32 / window.scale_factor() as f32;
let current = target.namespace.read().ok()?;
let frame = &current.document.frame;
if frame.session != hover.session
|| frame.fault.is_some()
|| target.guest_covered(hover.point)
{
return None;
}
let direction =
crate::tabs::edge_direction(&frame.tabs, width, target.tab_first, hover.point);
if direction != hover.direction {
return None;
}
let first = crate::tabs::scroll_start(&frame.tabs, width, target.tab_first, direction)?;
let index = crate::tabs::insertion_index(Some(first), &frame.tabs, width, hover.point)?;
drop(current);
target.tab_first = Some(first);
target.request_redraw();
Some((hover.window, index))
});
if let Some(feedback) = feedback {
self.clear_drag_feedback(Some(feedback));
hover.next = now + Duration::from_millis(120);
event_loop.set_control_flow(ControlFlow::WaitUntil(hover.next));
self.tab_scroll_hover = Some(hover);
}
}
fn native_tab_drag(&mut self, window_id: WindowId, event: &WindowEvent) {
if self.resource != crate::window::MAIN_WINDOW {
return;
@@ -617,6 +705,17 @@ impl TesseraApp {
return;
};
let receiver_id = receiver.resource;
if matches!(event, WindowEvent::CursorLeft { .. }) {
if self
.tab_scroll_hover
.as_ref()
.is_some_and(|hover| hover.window == receiver_id)
{
self.tab_scroll_hover = None;
self.clear_drag_feedback(None);
}
return;
}
if matches!(
event,
WindowEvent::Focused(true)
@@ -647,6 +746,7 @@ impl TesseraApp {
child.tab_drag_grab = None;
}
self.clear_drag_feedback(None);
self.clear_tab_scroll();
return;
}
let release = matches!(
@@ -728,6 +828,7 @@ impl TesseraApp {
child.tab_drag_grab = None;
}
self.clear_drag_feedback(None);
self.clear_tab_scroll();
return;
}
let mut apps: Vec<_> = self.apps().collect();
@@ -771,6 +872,7 @@ impl TesseraApp {
});
// An obscuring window (including its chrome/developer panel) prevents
// dropping into a lower window that happens to share these coordinates.
let mut scroll = None;
let target = front.and_then(|(app, relative, size, inside)| {
if !inside || app.guest_covered(relative) {
return None;
@@ -783,8 +885,13 @@ impl TesseraApp {
let index = if frame.tabs.is_empty() {
0
} else {
crate::tabs::insertion_index(&frame.tabs, size.width, relative)?
crate::tabs::insertion_index(app.tab_first, &frame.tabs, size.width, relative)?
};
let direction =
crate::tabs::edge_direction(&frame.tabs, size.width, app.tab_first, relative);
if direction != 0 {
scroll = Some((app.resource, frame.session, relative, direction));
}
Some(crate::events::TabDrop {
window: app.resource,
layout_version: frame.layout_version,
@@ -802,6 +909,23 @@ impl TesseraApp {
.all(|value| value.is_finite() && value.abs() <= 1_000_000.0)
.then_some([x.round() as i32, y.round() as i32])
});
self.tab_scroll_hover = scroll.map(|(window, session, point, direction)| {
let next = self
.tab_scroll_hover
.as_ref()
.filter(|old| {
old.window == window && old.session == session && old.direction == direction
})
.map(|old| old.next)
.unwrap_or_else(|| Instant::now() + Duration::from_millis(350));
TabScrollHover {
window,
session,
point,
direction,
next,
}
});
self.clear_drag_feedback(target.as_ref().map(|target| (target.window, target.index)));
if !release {
return;
@@ -829,6 +953,7 @@ impl TesseraApp {
source.guest_pressed = None;
source.send_guest(input);
self.clear_drag_feedback(None);
self.clear_tab_scroll();
}
fn create_native(&mut self, event_loop: &ActiveEventLoop) -> anyhow::Result<()> {
@@ -914,7 +1039,10 @@ impl TesseraApp {
&namespace.document,
&mut self.developer_tools,
&self.activity,
self.tab_drop_index,
crate::tabs::Chrome {
first: self.tab_first,
insertion: self.tab_drop_index,
},
);
drop(namespace);
self.layout = scene.layout;
@@ -951,6 +1079,11 @@ impl TesseraApp {
}
impl ApplicationHandler<AppEvent> for TesseraApp {
fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) {
event_loop.set_control_flow(ControlFlow::Wait);
self.tick_tab_scroll(event_loop);
}
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
if let Err(error) = self.create_native(event_loop) {
self.native_error = Some(format!(