feat: unify window chrome and managed workspace tabs
This commit is contained in:
+164
-23
@@ -16,7 +16,7 @@ use winit::{
|
||||
|
||||
use crate::{
|
||||
activity::Activity,
|
||||
developer_tools::DeveloperToolsState,
|
||||
developer_tools::Workspace as DeveloperToolsState,
|
||||
document::NamespaceState,
|
||||
geometry::Point,
|
||||
scene::{self, SceneLayout},
|
||||
@@ -44,6 +44,7 @@ pub struct TesseraApp {
|
||||
control: crate::api::RuntimeControl,
|
||||
exit_requested: bool,
|
||||
native_session: u64,
|
||||
startup_page_requested: bool,
|
||||
native_error: Option<String>,
|
||||
children: std::collections::BTreeMap<u64, TesseraApp>,
|
||||
proxy: EventLoopProxy<AppEvent>,
|
||||
@@ -54,6 +55,8 @@ pub struct TesseraApp {
|
||||
developer_tools: DeveloperToolsState,
|
||||
layout: SceneLayout,
|
||||
pointer: Point,
|
||||
pointer_inside: bool,
|
||||
new_tab_pressed: bool,
|
||||
modifiers: ModifiersState,
|
||||
activity: Activity,
|
||||
event_client: crate::events::Client,
|
||||
@@ -63,6 +66,8 @@ pub struct TesseraApp {
|
||||
tab_drag_grab: Option<Point>,
|
||||
tab_drop_index: Option<usize>,
|
||||
tab_first: Option<usize>,
|
||||
tab_motion: crate::tabs::Motion,
|
||||
tab_visual: crate::tabs::Visual,
|
||||
tab_scroll_hover: Option<TabScrollHover>,
|
||||
window_order: Vec<u64>,
|
||||
guest_focus: Option<crate::events::Input>,
|
||||
@@ -83,6 +88,7 @@ impl TesseraApp {
|
||||
control,
|
||||
exit_requested: false,
|
||||
native_session: 0,
|
||||
startup_page_requested: false,
|
||||
native_error: None,
|
||||
children: std::collections::BTreeMap::new(),
|
||||
proxy: proxy.clone(),
|
||||
@@ -90,13 +96,11 @@ impl TesseraApp {
|
||||
context: None,
|
||||
surface: None,
|
||||
namespace,
|
||||
developer_tools: {
|
||||
let mut state = DeveloperToolsState::default();
|
||||
state.proxy = Some(proxy);
|
||||
state
|
||||
},
|
||||
developer_tools: DeveloperToolsState::new(proxy),
|
||||
layout: SceneLayout::default(),
|
||||
pointer: Point::default(),
|
||||
pointer_inside: false,
|
||||
new_tab_pressed: false,
|
||||
modifiers: ModifiersState::default(),
|
||||
activity,
|
||||
event_client,
|
||||
@@ -106,6 +110,8 @@ impl TesseraApp {
|
||||
tab_drag_grab: None,
|
||||
tab_drop_index: None,
|
||||
tab_first: None,
|
||||
tab_motion: crate::tabs::Motion::default(),
|
||||
tab_visual: crate::tabs::Visual::default(),
|
||||
tab_scroll_hover: None,
|
||||
window_order: vec![crate::window::MAIN_WINDOW],
|
||||
guest_focus: None,
|
||||
@@ -286,11 +292,30 @@ impl TesseraApp {
|
||||
}
|
||||
}
|
||||
|
||||
fn toggle_developer_tools(&mut self) {
|
||||
if let Ok(namespace) = self.namespace.read() {
|
||||
self.developer_tools.toggle(&namespace.document);
|
||||
fn open_developer_tool(&mut self, name: &str) {
|
||||
let input = self.namespace.read().ok().map(|namespace| {
|
||||
let frame = &namespace.document.frame;
|
||||
crate::events::Input {
|
||||
window: self.resource,
|
||||
session: frame.session,
|
||||
layout_version: frame.layout_version,
|
||||
mount: 0,
|
||||
kind: format!("developer-open:{name}"),
|
||||
point: None,
|
||||
delta: None,
|
||||
press_point: None,
|
||||
tab_drop: None,
|
||||
screen_position: None,
|
||||
}
|
||||
});
|
||||
if let Some(input) = input {
|
||||
if input.session == 0 {
|
||||
self.developer_tools.initialize_tools(name);
|
||||
} else {
|
||||
self.send_guest(input);
|
||||
}
|
||||
}
|
||||
self.guest_keyboard = !self.developer_tools.open;
|
||||
self.guest_keyboard = false;
|
||||
self.request_redraw();
|
||||
}
|
||||
|
||||
@@ -333,7 +358,16 @@ impl TesseraApp {
|
||||
}
|
||||
|
||||
fn handle_keyboard(&mut self, event: &winit::event::KeyEvent) {
|
||||
if self.guest_keyboard && event.state == ElementState::Pressed && !event.repeat {
|
||||
if event.state == ElementState::Pressed
|
||||
&& !event.repeat
|
||||
&& (self.modifiers.super_key() || self.modifiers.control_key())
|
||||
&& matches!(&event.logical_key, Key::Character(key) if key.eq_ignore_ascii_case("t"))
|
||||
{
|
||||
self.open_developer_tool("New tab");
|
||||
return;
|
||||
}
|
||||
|
||||
if event.state == ElementState::Pressed && !event.repeat {
|
||||
let close = (self.modifiers.super_key() || self.modifiers.control_key())
|
||||
&& matches!(&event.logical_key, Key::Character(key) if key.eq_ignore_ascii_case("w"));
|
||||
let cycle = self.modifiers.control_key()
|
||||
@@ -361,11 +395,13 @@ impl TesseraApp {
|
||||
let is_f12 = matches!(event.logical_key, Key::Named(NamedKey::F12));
|
||||
let is_i =
|
||||
matches!(&event.logical_key, Key::Character(value) if value.eq_ignore_ascii_case("i"));
|
||||
let mac_shortcut = self.modifiers.super_key() && self.modifiers.alt_key() && is_i;
|
||||
let mac_shortcut = self.modifiers.super_key()
|
||||
&& (self.modifiers.alt_key() || self.modifiers.shift_key())
|
||||
&& is_i;
|
||||
let other_shortcut = self.modifiers.control_key() && self.modifiers.shift_key() && is_i;
|
||||
if is_f12 || mac_shortcut || other_shortcut {
|
||||
if !event.repeat {
|
||||
self.toggle_developer_tools();
|
||||
self.open_developer_tool("Console");
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -445,7 +481,7 @@ impl TesseraApp {
|
||||
if self.pointer.y < offset {
|
||||
return None;
|
||||
}
|
||||
let point = Point::new(self.pointer.x, self.pointer.y - offset);
|
||||
let point = Point::new(self.pointer.x - crate::tabs::RAIL, self.pointer.y - offset);
|
||||
let mount = frame.hit_test(point)?;
|
||||
Some(crate::events::Input {
|
||||
window: self.resource,
|
||||
@@ -501,6 +537,24 @@ impl TesseraApp {
|
||||
}
|
||||
}
|
||||
|
||||
fn new_tab_hit(&self) -> bool {
|
||||
let Some(window) = &self.window else {
|
||||
return false;
|
||||
};
|
||||
self.namespace.read().is_ok_and(|n| {
|
||||
(if self.tab_visual.plus.width > 0.0 {
|
||||
self.tab_visual.plus
|
||||
} else {
|
||||
crate::tabs::plus_rect(
|
||||
self.tab_first,
|
||||
&n.document.frame.tabs,
|
||||
window.inner_size().width as f32 / window.scale_factor() as f32,
|
||||
)
|
||||
})
|
||||
.contains(self.pointer)
|
||||
})
|
||||
}
|
||||
|
||||
fn tab_hit(&self) -> Option<crate::events::Input> {
|
||||
if self.guest_covered(self.pointer) {
|
||||
return None;
|
||||
@@ -512,7 +566,16 @@ impl TesseraApp {
|
||||
return None;
|
||||
}
|
||||
let width = window.inner_size().width as f32 / window.scale_factor() as f32;
|
||||
let (id, close) = crate::tabs::hit(self.tab_first, &frame.tabs, width, self.pointer)?;
|
||||
let (id, close) = if self.tab_visual.rects.is_empty() {
|
||||
crate::tabs::hit(self.tab_first, &frame.tabs, width, self.pointer)
|
||||
} else {
|
||||
self.tab_visual.hit(self.pointer).or_else(|| {
|
||||
crate::tabs::navigation_hit(self.tab_first, &frame.tabs, width, self.pointer)
|
||||
})
|
||||
}?;
|
||||
if !frame.tabs.iter().any(|tab| tab.id == id) {
|
||||
return None;
|
||||
}
|
||||
Some(crate::events::Input {
|
||||
window: self.resource,
|
||||
session: frame.session,
|
||||
@@ -610,6 +673,14 @@ impl TesseraApp {
|
||||
fn drag_anchor(&self, input: &crate::events::Input) -> Option<Point> {
|
||||
let window = self.window.as_ref()?;
|
||||
let current = self.namespace.read().ok()?;
|
||||
if let Some((_, rect)) = self
|
||||
.tab_visual
|
||||
.rects
|
||||
.iter()
|
||||
.find(|(id, _)| *id == input.mount)
|
||||
{
|
||||
return Some(Point::new(self.pointer.x - rect.x, self.pointer.y));
|
||||
}
|
||||
crate::tabs::drag_anchor(
|
||||
self.tab_first,
|
||||
¤t.document.frame.tabs,
|
||||
@@ -988,6 +1059,14 @@ impl TesseraApp {
|
||||
crate::window::MAX_WINDOW_DIMENSION,
|
||||
crate::window::MAX_WINDOW_DIMENSION,
|
||||
));
|
||||
#[cfg(target_os = "macos")]
|
||||
let attributes = {
|
||||
use winit::platform::macos::WindowAttributesExtMacOS;
|
||||
attributes
|
||||
.with_title_hidden(true)
|
||||
.with_titlebar_transparent(true)
|
||||
.with_fullsize_content_view(true)
|
||||
};
|
||||
let window = Arc::new(event_loop.create_window(attributes)?);
|
||||
let context = Context::new(window.clone()).map_err(|error| anyhow::anyhow!("{error}"))?;
|
||||
let surface =
|
||||
@@ -1046,7 +1125,9 @@ impl TesseraApp {
|
||||
}
|
||||
|
||||
fn try_redraw(&mut self) -> anyhow::Result<()> {
|
||||
let guest_cursor = self.guest_hit().is_some() || self.tab_hit().is_some();
|
||||
let pointer = self.pointer_inside.then_some(self.pointer);
|
||||
let hover = pointer.and_then(|_| self.tab_hit().map(|input| input.mount));
|
||||
let guest_cursor = self.guest_hit().is_some() || hover.is_some() || self.new_tab_hit();
|
||||
let (Some(window), Some(surface)) = (self.window.as_ref(), self.surface.as_mut()) else {
|
||||
return Ok(());
|
||||
};
|
||||
@@ -1060,6 +1141,11 @@ impl TesseraApp {
|
||||
let Ok(namespace) = self.namespace.read() else {
|
||||
return Ok(());
|
||||
};
|
||||
self.tab_visual = self.tab_motion.sample(
|
||||
&namespace.document.frame.tabs,
|
||||
self.tab_first,
|
||||
size.width as f32 / window.scale_factor() as f32,
|
||||
);
|
||||
let scene = scene::build_scene(
|
||||
size.width,
|
||||
size.height,
|
||||
@@ -1070,6 +1156,8 @@ impl TesseraApp {
|
||||
crate::tabs::Chrome {
|
||||
first: self.tab_first,
|
||||
insertion: self.tab_drop_index,
|
||||
pointer,
|
||||
visual: self.tab_visual.clone(),
|
||||
},
|
||||
);
|
||||
drop(namespace);
|
||||
@@ -1127,9 +1215,37 @@ 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);
|
||||
let now = Instant::now();
|
||||
let mut next = match event_loop.control_flow() {
|
||||
ControlFlow::WaitUntil(deadline) => Some(deadline),
|
||||
_ => None,
|
||||
};
|
||||
for app in std::iter::once(&*self).chain(self.children.values()) {
|
||||
if let Some(deadline) = app.tab_motion.next_frame {
|
||||
if now >= deadline {
|
||||
app.request_redraw();
|
||||
}
|
||||
let deadline = deadline.max(now + Duration::from_millis(1));
|
||||
next = Some(next.map_or(deadline, |previous| previous.min(deadline)));
|
||||
}
|
||||
}
|
||||
if let Some(deadline) = next {
|
||||
event_loop.set_control_flow(ControlFlow::WaitUntil(deadline));
|
||||
}
|
||||
}
|
||||
|
||||
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
|
||||
if self.resource == crate::window::MAIN_WINDOW
|
||||
&& !self.startup_page_requested
|
||||
&& self
|
||||
.namespace
|
||||
.read()
|
||||
.is_ok_and(|n| n.runtime_session == 0 && n.document.frame.tabs.is_empty())
|
||||
{
|
||||
self.startup_page_requested = true;
|
||||
self.developer_tools.initialize_tools("New tab");
|
||||
}
|
||||
|
||||
if let Err(error) = self.create_native(event_loop) {
|
||||
self.native_error = Some(format!(
|
||||
"Window {} initialization failed: {error:#}",
|
||||
@@ -1235,6 +1351,7 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
let scale = window.scale_factor() as f32;
|
||||
let next = Point::new(x as f32 / scale, y as f32 / scale);
|
||||
let delta = Point::new(next.x - self.pointer.x, next.y - self.pointer.y);
|
||||
self.pointer_inside = true;
|
||||
self.pointer = next;
|
||||
self.developer_tools.move_pointer(
|
||||
next,
|
||||
@@ -1242,15 +1359,19 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
&self.layout.developer_tools,
|
||||
window.inner_size().width as f32 / scale,
|
||||
);
|
||||
window.set_cursor(if self.guest_hit().is_some() || self.tab_hit().is_some() {
|
||||
winit::window::CursorIcon::Pointer
|
||||
} else {
|
||||
self.developer_tools
|
||||
.cursor_kind(&self.layout.developer_tools)
|
||||
});
|
||||
window.set_cursor(
|
||||
if self.guest_hit().is_some() || self.tab_hit().is_some() || self.new_tab_hit()
|
||||
{
|
||||
winit::window::CursorIcon::Pointer
|
||||
} else {
|
||||
self.developer_tools
|
||||
.cursor_kind(&self.layout.developer_tools)
|
||||
},
|
||||
);
|
||||
window.request_redraw();
|
||||
}
|
||||
WindowEvent::CursorLeft { .. } => {
|
||||
self.pointer_inside = false;
|
||||
self.guest_pressed = None;
|
||||
if self.tab_drag_origin.is_none() {
|
||||
self.tab_pressed = None;
|
||||
@@ -1265,6 +1386,17 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
..
|
||||
} => {
|
||||
if state == ElementState::Pressed {
|
||||
if self.new_tab_hit() {
|
||||
self.new_tab_pressed = true;
|
||||
window.request_redraw();
|
||||
return;
|
||||
}
|
||||
if self.pointer.y < crate::tabs::HEIGHT
|
||||
&& self.pointer.x >= crate::tabs::LEADING
|
||||
&& self.tab_hit().is_none()
|
||||
{
|
||||
let _ = window.drag_window();
|
||||
}
|
||||
self.guest_keyboard = !self.guest_covered(self.pointer);
|
||||
self.tab_pressed = self.tab_hit();
|
||||
self.tab_drag_grab = self
|
||||
@@ -1283,6 +1415,14 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
&self.activity,
|
||||
);
|
||||
} else {
|
||||
if self.new_tab_pressed {
|
||||
self.new_tab_pressed = false;
|
||||
if self.new_tab_hit() {
|
||||
self.open_developer_tool("New tab");
|
||||
}
|
||||
window.request_redraw();
|
||||
return;
|
||||
}
|
||||
if let Some(mut pressed) = self.tab_pressed.take() {
|
||||
let width = window.inner_size().width as f32 / window.scale_factor() as f32;
|
||||
let dragged = self.tab_drag_origin.take().is_some_and(|origin| {
|
||||
@@ -1347,7 +1487,8 @@ impl ApplicationHandler<AppEvent> for TesseraApp {
|
||||
{
|
||||
return None;
|
||||
}
|
||||
let point = Point::new(self.pointer.x, self.pointer.y - offset);
|
||||
let point =
|
||||
Point::new(self.pointer.x - crate::tabs::RAIL, self.pointer.y - offset);
|
||||
let delta = [-dx, -dy];
|
||||
let mount = crate::scroll::wheel_target(frame, point, delta)?;
|
||||
Some(crate::events::Input {
|
||||
|
||||
Reference in New Issue
Block a user