Merge branch 'main' into fix/buffer_offset

YaLTeR · Sep 30, 2024 · 56d799b · 56d799b
2 parents aaad279 + 80bb0d5
commit 56d799b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/layout/monitor.rs b/src/layout/monitor.rs
@@ -403,7 +403,7 @@ impl<W: LayoutElement> Monitor<W> {
             let curr_idx = workspace.columns[workspace.active_column_idx].active_tile_idx;
             let new_idx = curr_idx.saturating_sub(1);
             if curr_idx == new_idx {
-                self.focus_left();
+                self.focus_right();
             } else {
                 workspace.focus_up();
             }

diff --git a/src/niri.rs b/src/niri.rs
@@ -641,7 +641,6 @@ impl State {
         let Some(output) = self.niri.layout.active_output() else {
             return false;
         };
-        let output = output.clone();
         let monitor = self.niri.layout.monitor_for_output(&output).unwrap();
 
         let mut rv = false;
@@ -2676,7 +2675,7 @@ impl Niri {
             .tablet_cursor_location
             .unwrap_or_else(|| self.seat.get_pointer().unwrap().current_location());
 
-        match self.cursor_manager.cursor_image().clone() {
+        match self.cursor_manager.cursor_image() {
             CursorImageStatus::Surface(ref surface) => {
                 let hotspot = with_states(surface, |states| {
                     states
@@ -2761,7 +2760,7 @@ impl Niri {
                 };
 
                 let icon = if let CursorImageStatus::Named(icon) = cursor_image {
-                    icon
+                    icon.clone()
                 } else {
                     Default::default()
                 };