Merge remote-tracking branch 'upstream/main' into feat/blur

Author: busyoGG

docs/wiki/FAQ.md

@@ -45,7 +45,7 @@ hotkey-overlay {
 To run X11 apps, you can use [xwayland-satellite](https://github.com/Supreeeme/xwayland-satellite).
 Check [the Xwayland wiki page](./Xwayland.md) for instructions.
 
-Keep in mind that you can run many Electron apps such as VSCode natively on Wayland by passing the right flags, e.g. `code --ozone-platform-hint=auto`
+Keep in mind that you can run many Electron apps such as VSCode or Discord natively on Wayland by passing the right flags, as described [here](./Application-Issues.md#electron-applications).
 
 ### Why doesn't niri integrate Xwayland like other compositors?
 

src/layer/mod.rs

@@ -7,7 +7,7 @@ pub mod mapped;
 pub use mapped::MappedLayer;
 
 /// Rules fully resolved for a layer-shell surface.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Default, PartialEq)]
 pub struct ResolvedLayerRules {
     /// Extra opacity to draw this layer surface with.
     pub opacity: Option<f32>,
@@ -37,42 +37,10 @@ pub struct ResolvedLayerRules {
 }
 
 impl ResolvedLayerRules {
-    pub const fn empty() -> Self {
-        Self {
-            opacity: None,
-            block_out_from: None,
-            shadow: ShadowRule {
-                off: false,
-                on: false,
-                offset: None,
-                softness: None,
-                spread: None,
-                draw_behind_window: None,
-                color: None,
-                inactive_color: None,
-                struts: None,
-            },
-            blur: BlurRule {
-                off: false,
-                on: false,
-                passes: None,
-                radius: None,
-                noise: None,
-                ignore_alpha: None,
-                blur_when_keyboard_focused: None,
-            },
-            geometry_corner_radius: None,
-            place_within_backdrop: false,
-            baba_is_float: false,
-            transparent_block: None,
-            exponent: None,
-        }
-    }
-
     pub fn compute(rules: &[LayerRule], surface: &LayerSurface, is_at_startup: bool) -> Self {
         let _span = tracy_client::span!("ResolvedLayerRules::compute");
 
-        let mut resolved = ResolvedLayerRules::empty();
+        let mut resolved = ResolvedLayerRules::default();
 
         for rule in rules {
             let matches = |m: &Match| {

src/layout/tile.rs

@@ -1087,7 +1087,7 @@ impl<W: LayoutElement> Tile<W> {
         let location = location + self.bob_offset();
 
         let window_loc = self.window_loc();
-        let window_size = self.window_size().to_f64();
+        let window_size = self.window_size();
         let animated_window_size = self.animated_window_size();
         let window_render_loc = location + window_loc;
         let area = Rectangle::new(window_render_loc, animated_window_size);

src/screencasting/pw_utils.rs

@@ -776,7 +776,7 @@ impl PipeWire {
                                             pod::Value::Choice(ChoiceValue::Int(Choice(
                                                         ChoiceFlags::empty(),
                                                         ChoiceEnum::Range {
-                                                            default: 16,
+                                                            default: 8,
                                                             min: 2,
                                                             max: 16
                                                         }