diff options
author | Christian Duerr <chrisduerr@users.noreply.github.com> | 2018-07-28 23:16:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-28 23:16:28 +0000 |
commit | 7c5585ff258780be9dcbee135f65b844edf011cb (patch) | |
tree | 2301700b6cbdc13cce31f0412c2c6fee8c553b1c | |
parent | c4a0f9c4cb7e8d73914800c4ba64413970f98540 (diff) | |
parent | 57a455e5f209dd965fd6b495d7f2b033fd5288c0 (diff) | |
download | alacritty-7c5585ff258780be9dcbee135f65b844edf011cb.tar.gz alacritty-7c5585ff258780be9dcbee135f65b844edf011cb.zip |
Merge branch 'master' into scrollback
-rw-r--r-- | src/event.rs | 4 | ||||
-rw-r--r-- | src/term/mod.rs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/event.rs b/src/event.rs index de0faf7f..ea3d1d74 100644 --- a/src/event.rs +++ b/src/event.rs @@ -477,6 +477,10 @@ impl<N: Notify> Processor<N> { window.hide(); } + if self.window_changes.hide { + window.hide(); + } + self.window_changes.clear(); self.wait_for_event = !terminal.dirty; diff --git a/src/term/mod.rs b/src/term/mod.rs index 97f8b779..2cc60e30 100644 --- a/src/term/mod.rs +++ b/src/term/mod.rs @@ -1079,6 +1079,7 @@ impl Term { .map(|span| { span.to_locations() }); + let cursor = if window_focused || !config.unfocused_hollow_cursor() { self.cursor_style.unwrap_or(self.default_cursor_style) } else { |