leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell/element: Attach a resize border to tiled undecorated windows

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-04-03 12:51:12 +02:00 • committed by Victoria Brekenfeld
parent c17543169a
commit a8d12f3172
1 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/shell/element/window.rs
View file

@ -167,10 +167,16 @@ impl CosmicWindowInternal {
pub fn current_focus(&self) -> Option<Focus> { pub fn current_focus(&self) -> Option<Focus> {
unsafe { Focus::from_u8(self.pointer_entered.load(Ordering::SeqCst)) } unsafe { Focus::from_u8(self.pointer_entered.load(Ordering::SeqCst)) }
} }
/// returns if the window has any current or pending server-side decorations /// returns if the window has any current or pending server-side decorations
pub fn has_ssd(&self, pending: bool) -> bool { pub fn has_ssd(&self, pending: bool) -> bool {
!self.window.is_decorated(pending) !self.window.is_decorated(pending)
} }
/// returns if the window is currently or pending tiled
pub fn is_tiled(&self, pending: bool) -> bool {
self.window.is_tiled(pending).unwrap_or(false)
}
} }
impl CosmicWindow { impl CosmicWindow {
@ -240,16 +246,20 @@ impl CosmicWindow {
self.0.with_program(|p| { self.0.with_program(|p| {
let mut offset = Point::from((0., 0.)); let mut offset = Point::from((0., 0.));
let mut window_ui = None; let mut window_ui = None;
if p.has_ssd(false) && surface_type.contains(WindowSurfaceType::TOPLEVEL) { let has_ssd = p.has_ssd(false);
if (has_ssd || p.is_tiled(false)) && surface_type.contains(WindowSurfaceType::TOPLEVEL)
{
let geo = p.window.geometry(); let geo = p.window.geometry();
let point_i32 = relative_pos.to_i32_round::<i32>(); let point_i32 = relative_pos.to_i32_round::<i32>();
let ssd_height = has_ssd.then_some(SSD_HEIGHT).unwrap_or(0);
if (point_i32.x - geo.loc.x >= -RESIZE_BORDER && point_i32.x - geo.loc.x < 0) if (point_i32.x - geo.loc.x >= -RESIZE_BORDER && point_i32.x - geo.loc.x < 0)
|| (point_i32.y - geo.loc.y >= -RESIZE_BORDER && point_i32.y - geo.loc.y < 0) || (point_i32.y - geo.loc.y >= -RESIZE_BORDER && point_i32.y - geo.loc.y < 0)
|| (point_i32.x - geo.loc.x >= geo.size.w || (point_i32.x - geo.loc.x >= geo.size.w
&& point_i32.x - geo.loc.x < geo.size.w + RESIZE_BORDER) && point_i32.x - geo.loc.x < geo.size.w + RESIZE_BORDER)
|| (point_i32.y - geo.loc.y >= geo.size.h + SSD_HEIGHT || (point_i32.y - geo.loc.y >= geo.size.h + ssd_height
&& point_i32.y - geo.loc.y < geo.size.h + SSD_HEIGHT + RESIZE_BORDER) && point_i32.y - geo.loc.y < geo.size.h + ssd_height + RESIZE_BORDER)
{ {
window_ui = Some(( window_ui = Some((
PointerFocusTarget::WindowUI(self.clone()), PointerFocusTarget::WindowUI(self.clone()),
@ -257,7 +267,7 @@ impl CosmicWindow {
)); ));
} }
if point_i32.y - geo.loc.y < SSD_HEIGHT { if has_ssd && (point_i32.y - geo.loc.y < SSD_HEIGHT) {
window_ui = Some(( window_ui = Some((
PointerFocusTarget::WindowUI(self.clone()), PointerFocusTarget::WindowUI(self.clone()),
Point::from((0., 0.)), Point::from((0., 0.)),
@ -265,7 +275,7 @@ impl CosmicWindow {
} }
} }
if p.has_ssd(false) { if has_ssd {
relative_pos.y -= SSD_HEIGHT as f64; relative_pos.y -= SSD_HEIGHT as f64;
offset.y += SSD_HEIGHT as f64; offset.y += SSD_HEIGHT as f64;
} }
@ -570,11 +580,16 @@ impl SpaceElement for CosmicWindow {
fn bbox(&self) -> Rectangle<i32, Logical> { fn bbox(&self) -> Rectangle<i32, Logical> {
self.0.with_program(|p| { self.0.with_program(|p| {
let mut bbox = SpaceElement::bbox(&p.window); let mut bbox = SpaceElement::bbox(&p.window);
if p.has_ssd(false) { let has_ssd = p.has_ssd(false);
if has_ssd || p.is_tiled(false) {
bbox.loc -= Point::from((RESIZE_BORDER, RESIZE_BORDER)); bbox.loc -= Point::from((RESIZE_BORDER, RESIZE_BORDER));
bbox.size += Size::from((RESIZE_BORDER * 2, RESIZE_BORDER * 2)); bbox.size += Size::from((RESIZE_BORDER * 2, RESIZE_BORDER * 2));
}
if has_ssd {
bbox.size.h += SSD_HEIGHT; bbox.size.h += SSD_HEIGHT;
} }
bbox bbox
}) })
} }
@ -680,10 +695,16 @@ impl PointerTarget<State> for CosmicWindow {
fn enter(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) { fn enter(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) {
let mut event = event.clone(); let mut event = event.clone();
self.0.with_program(|p| { self.0.with_program(|p| {
if p.has_ssd(false) { let has_ssd = p.has_ssd(false);
let Some(next) = Focus::under(&p.window, SSD_HEIGHT, event.location) else { if has_ssd || p.is_tiled(false) {
let Some(next) = Focus::under(
&p.window,
has_ssd.then_some(SSD_HEIGHT).unwrap_or(0),
event.location,
) else {
return; return;
}; };
let old_focus = p.swap_focus(Some(next)); let old_focus = p.swap_focus(Some(next));
assert_eq!(old_focus, None); assert_eq!(old_focus, None);
@ -701,8 +722,13 @@ impl PointerTarget<State> for CosmicWindow {
fn motion(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) { fn motion(&self, seat: &Seat<State>, data: &mut State, event: &MotionEvent) {
let mut event = event.clone(); let mut event = event.clone();
self.0.with_program(|p| { self.0.with_program(|p| {
if p.has_ssd(false) { let has_ssd = p.has_ssd(false);
let Some(next) = Focus::under(&p.window, SSD_HEIGHT, event.location) else { if has_ssd || p.is_tiled(false) {
let Some(next) = Focus::under(
&p.window,
has_ssd.then_some(SSD_HEIGHT).unwrap_or(0),
event.location,
) else {
return; return;
}; };
let _previous = p.swap_focus(Some(next)); let _previous = p.swap_focus(Some(next));