diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/input.rs | 4 | ||||
| -rw-r--r-- | src/niri.rs | 6 | ||||
| -rw-r--r-- | src/protocols/foreign_toplevel.rs | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/input.rs b/src/input.rs index 15af28e6..715d39c8 100644 --- a/src/input.rs +++ b/src/input.rs @@ -845,7 +845,7 @@ impl State { // Activate a new confinement if necessary. self.niri.maybe_activate_pointer_constraint(new_pos, &under); - self.niri.pointer_focus = under.clone(); + self.niri.pointer_focus.clone_from(&under); let under = under.map(|u| u.surface); pointer.motion( @@ -908,7 +908,7 @@ impl State { let under = self.niri.surface_under_and_global_space(pos); self.niri.maybe_activate_pointer_constraint(pos, &under); - self.niri.pointer_focus = under.clone(); + self.niri.pointer_focus.clone_from(&under); let under = under.map(|u| u.surface); pointer.motion( diff --git a/src/niri.rs b/src/niri.rs index 7aea5aec..89c3dce3 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -374,7 +374,7 @@ impl State { let under = self.niri.surface_under_and_global_space(location); self.niri .maybe_activate_pointer_constraint(location, &under); - self.niri.pointer_focus = under.clone(); + self.niri.pointer_focus.clone_from(&under); let under = under.map(|u| u.surface); let pointer = &self.niri.seat.get_pointer().unwrap(); @@ -433,7 +433,7 @@ impl State { self.niri .maybe_activate_pointer_constraint(location, &under); - self.niri.pointer_focus = under.clone(); + self.niri.pointer_focus.clone_from(&under); let under = under.map(|u| u.surface); pointer.motion( @@ -588,7 +588,7 @@ impl State { } } - self.niri.keyboard_focus = focus.clone(); + self.niri.keyboard_focus.clone_from(&focus); keyboard.set_focus(self, focus, SERIAL_COUNTER.next_serial()); // FIXME: can be more granular. diff --git a/src/protocols/foreign_toplevel.rs b/src/protocols/foreign_toplevel.rs index f1516cc4..5366da1a 100644 --- a/src/protocols/foreign_toplevel.rs +++ b/src/protocols/foreign_toplevel.rs @@ -172,7 +172,7 @@ fn refresh_toplevel( let mut new_title = None; if data.title != role.title { - data.title = role.title.clone(); + data.title.clone_from(&role.title); new_title = role.title.as_deref(); if new_title.is_none() { @@ -182,7 +182,7 @@ fn refresh_toplevel( let mut new_app_id = None; if data.app_id != role.app_id { - data.app_id = role.app_id.clone(); + data.app_id.clone_from(&role.app_id); new_app_id = role.app_id.as_deref(); if new_app_id.is_none() { |