1
0
Fork 0
forked from wry/wry

Merge pull request #111 from mahkoh/jorth/kb-focus

seat: use kb_owner code path for all keyboard_node changes
This commit is contained in:
mahkoh 2024-03-02 19:12:34 +01:00 committed by GitHub
commit 2a61aee979
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 7 deletions

View file

@ -100,7 +100,7 @@ impl NodeSeatState {
fn release_kb_focus2(&self, focus_last: bool) {
self.release_kb_grab();
while let Some((_, seat)) = self.kb_foci.pop() {
seat.keyboard_node.set(seat.state.root.clone());
seat.kb_owner.set_kb_node(&seat, seat.state.root.clone());
// log::info!("keyboard_node = root");
if focus_last {
seat.output
@ -149,9 +149,6 @@ impl NodeSeatState {
pub fn set_visible(&self, node: &dyn Node, visible: bool) {
if !visible {
if !self.kb_foci.is_empty() {
node.node_active_changed(false);
}
self.destroy_node2(node, false);
}
}

View file

@ -996,9 +996,6 @@ impl WlSurface {
for seat in remove {
data.focus_node.remove(&seat);
}
if self.seat_state.is_active() {
tl.tl_surface_active_changed(false);
}
}
self.send_seat_release_events();
self.seat_state.destroy_node(self);