wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 03:09:06 +03:00
Code Issues Projects Releases Wiki Activity

Revert "wayland: implement focus_change callback"

Browse Source 
This reverts commit bfa8d0c207,
which proved not to be needed because it was already covered
by the `KeyboardEvent::Enter` and `KeyboardEvent::Leave` handling.
This commit is contained in:
Wez Furlong 2019-12-30 08:35:52 -08:00
parent f0e94084d1
commit a396a64550
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
window/src/os/wayland/window.rs
View File

@ -109,7 +109,6 @@ struct PendingEvent {
refresh_decorations: bool,
configure: Option<(u32, u32)>,
dpi: Option<i32>,
focus: Option<bool>,
}
impl PendingEvent {
@ -131,13 +130,8 @@ impl PendingEvent {
false
}
}
Event::Configure { new_size, states } => {
Event::Configure { new_size, .. } => {
let changed;
self.focus.replace(
states
.iter()
.any(|&s| s == toolkit::window::State::Activated),
);
if let Some(new_size) = new_size {
changed = self.configure.is_none();
self.configure.replace(new_size);
@ -475,15 +469,9 @@ impl WaylandWindowInner {
}
}
if let Some(focus) = pending.focus.take() {
self.callbacks.focus_change(focus);
}
self.refresh_frame();
self.do_paint().unwrap();
}
} else if let Some(focus) = pending.focus.take() {
self.callbacks.focus_change(focus);
}
if pending.refresh_decorations && self.window.is_some() {
self.refresh_frame();