element/window: Input offset fixes

Drakulix · Drakulix · commit eb64fdaf8fe4 · 2024-10-25T11:27:55.000+02:00
diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs
@@ -256,7 +256,7 @@ impl CosmicWindow {
                     || (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 + RESIZE_BORDER)
-                    || (point_i32.y - geo.loc.y >= geo.size.h
+                    || (point_i32.y - geo.loc.y >= geo.size.h + SSD_HEIGHT
                         && point_i32.y - geo.loc.y < geo.size.h + SSD_HEIGHT + RESIZE_BORDER)
                 {
                     window_ui = Some((
@@ -271,7 +271,9 @@ impl CosmicWindow {
                         Point::from((0., 0.)),
                     ));
                 }
+            }
 
+            if p.has_ssd(false) {
                 relative_pos.y -= SSD_HEIGHT as f64;
                 offset.y += SSD_HEIGHT as f64;
             }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ impl CosmicWindow {`
`256`	`256`	`\|\| (point_i32.y - geo.loc.y >= -RESIZE_BORDER && point_i32.y - geo.loc.y < 0)`
`257`	`257`	`\|\| (point_i32.x - geo.loc.x >= geo.size.w`
`258`	`258`	`&& point_i32.x - geo.loc.x < geo.size.w + RESIZE_BORDER)`
`259`		`- \|\| (point_i32.y - geo.loc.y >= geo.size.h`
	`259`	`+ \|\| (point_i32.y - geo.loc.y >= geo.size.h + SSD_HEIGHT`
`260`	`260`	`&& point_i32.y - geo.loc.y < geo.size.h + SSD_HEIGHT + RESIZE_BORDER)`
`261`	`261`	`{`
`262`	`262`	`window_ui = Some((`
`@@ -271,7 +271,9 @@ impl CosmicWindow {`
`271`	`271`	`Point::from((0., 0.)),`
`272`	`272`	`));`
`273`	`273`	`}`
	`274`	`+ }`
`274`	`275`
	`276`	`+ if p.has_ssd(false) {`
`275`	`277`	`relative_pos.y -= SSD_HEIGHT as f64;`
`276`	`278`	`offset.y += SSD_HEIGHT as f64;`
`277`	`279`	`}`