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

stack: Fix initial geometry of moved out windows

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-06-12 17:43:11 +02:00
parent be95fb9070
commit 1dd0c3ecb7
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,8 +100,8 @@ impl CosmicWindowInternal {
unsafe { std::mem::transmute::<u8, Focus>(self.pointer_entered.load(Ordering::SeqCst)) } unsafe { std::mem::transmute::<u8, Focus>(self.pointer_entered.load(Ordering::SeqCst)) }
} }
pub fn has_ssd(&self) -> bool { pub fn has_ssd(&self, pending: bool) -> bool {
!self.window.is_decorated(false) !self.window.is_decorated(pending)
} }
} }
@ -130,11 +130,11 @@ impl CosmicWindow {
self.0.with_program(|p| { self.0.with_program(|p| {
let loc = ( let loc = (
geo.loc.x, geo.loc.x,
geo.loc.y + if p.has_ssd() { SSD_HEIGHT } else { 0 }, geo.loc.y + if p.has_ssd(true) { SSD_HEIGHT } else { 0 },
); );
let size = ( let size = (
geo.size.w, geo.size.w,
std::cmp::max(geo.size.h - if p.has_ssd() { SSD_HEIGHT } else { 0 }, 0), std::cmp::max(geo.size.h - if p.has_ssd(true) { SSD_HEIGHT } else { 0 }, 0),
); );
p.window p.window
.set_geometry(Rectangle::from_loc_and_size(loc, size)); .set_geometry(Rectangle::from_loc_and_size(loc, size));
@ -152,7 +152,7 @@ impl CosmicWindow {
} }
pub fn offset(&self) -> Point<i32, Logical> { pub fn offset(&self) -> Point<i32, Logical> {
let has_ssd = self.0.with_program(|p| p.has_ssd()); let has_ssd = self.0.with_program(|p| p.has_ssd(false));
if has_ssd { if has_ssd {
Point::from((0, SSD_HEIGHT)) Point::from((0, SSD_HEIGHT))
} else { } else {
@ -300,7 +300,7 @@ 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() { if p.has_ssd(false) {
bbox.size.h += SSD_HEIGHT; bbox.size.h += SSD_HEIGHT;
} }
bbox bbox
@ -312,7 +312,7 @@ impl SpaceElement for CosmicWindow {
return false; return false;
} }
self.0.with_program(|p| { self.0.with_program(|p| {
if p.has_ssd() { if p.has_ssd(false) {
if point.y < SSD_HEIGHT as f64 { if point.y < SSD_HEIGHT as f64 {
return true; return true;
} else { } else {
@ -341,7 +341,7 @@ impl SpaceElement for CosmicWindow {
fn geometry(&self) -> Rectangle<i32, Logical> { fn geometry(&self) -> Rectangle<i32, Logical> {
self.0.with_program(|p| { self.0.with_program(|p| {
let mut geo = SpaceElement::geometry(&p.window); let mut geo = SpaceElement::geometry(&p.window);
if p.has_ssd() { if p.has_ssd(false) {
geo.size.h += SSD_HEIGHT; geo.size.h += SSD_HEIGHT;
} }
geo geo
@ -416,7 +416,7 @@ impl PointerTarget<State> for CosmicWindow {
} }
} }
if p.has_ssd() { if p.has_ssd(false) {
if event.location.y < SSD_HEIGHT as f64 { if event.location.y < SSD_HEIGHT as f64 {
let focus = p.swap_focus(Focus::Header); let focus = p.swap_focus(Focus::Header);
assert_eq!(focus, Focus::None); assert_eq!(focus, Focus::None);
@ -452,7 +452,7 @@ impl PointerTarget<State> for CosmicWindow {
} }
} }
if p.has_ssd() { if p.has_ssd(false) {
if event.location.y < SSD_HEIGHT as f64 { if event.location.y < SSD_HEIGHT as f64 {
let previous = p.swap_focus(Focus::Header); let previous = p.swap_focus(Focus::Header);
if previous == Focus::Window { if previous == Focus::Window {
@ -491,7 +491,7 @@ impl PointerTarget<State> for CosmicWindow {
fn relative_motion(&self, seat: &Seat<State>, data: &mut State, event: &RelativeMotionEvent) { fn relative_motion(&self, seat: &Seat<State>, data: &mut State, event: &RelativeMotionEvent) {
self.0.with_program(|p| { self.0.with_program(|p| {
if !p.has_ssd() || p.current_focus() == Focus::Window { if !p.has_ssd(false) || p.current_focus() == Focus::Window {
PointerTarget::relative_motion(&p.window, seat, data, event) PointerTarget::relative_motion(&p.window, seat, data, event)
} }
}) })
@ -561,7 +561,7 @@ where
scale: Scale<f64>, scale: Scale<f64>,
alpha: f32, alpha: f32,
) -> Vec<C> { ) -> Vec<C> {
let has_ssd = self.0.with_program(|p| p.has_ssd()); let has_ssd = self.0.with_program(|p| p.has_ssd(false));
let window_loc = if has_ssd { let window_loc = if has_ssd {
location + Point::from((0, (SSD_HEIGHT as f64 * scale.y) as i32)) location + Point::from((0, (SSD_HEIGHT as f64 * scale.y) as i32))