mirror of
https://github.com/wez/wezterm.git
synced 2024-12-23 21:32:13 +03:00
fix: InputMap reading global config instead of window overrides
refs: #656
This commit is contained in:
parent
fb69545daa
commit
76353a6240
@ -1,4 +1,4 @@
|
||||
use crate::configuration;
|
||||
use crate::ConfigHandle;
|
||||
use crate::LeaderKey;
|
||||
use luahelper::impl_lua_conversion;
|
||||
use serde::{Deserialize, Serialize};
|
||||
@ -211,8 +211,7 @@ pub struct InputMap {
|
||||
}
|
||||
|
||||
impl InputMap {
|
||||
pub fn new() -> Self {
|
||||
let config = configuration();
|
||||
pub fn new(config: &ConfigHandle) -> Self {
|
||||
let mut mouse = config.mouse_bindings();
|
||||
|
||||
let mut keys = config.key_bindings();
|
||||
|
@ -30,6 +30,7 @@ As features stabilize some brief notes about them will accumulate here.
|
||||
* Improved: fallback fonts are scaled according to relative their *cap-height* metric to improve size consistency. This partially applies to some symbol/emoji fonts, but is dependent upon the font having reliable metrics.
|
||||
* Improved: font-config queries now run much faster, resulting in snappier startup on unix systems
|
||||
* Fixed: [Hide](config/lua/keyassignment/Hide.md) had no effect on macOS when the titlebar was disabled [#679](https://github.com/wez/wezterm/issues/679)
|
||||
* Fixed: key and mouse assignments set via [window:set_config_overrides](config/lua/window/set_config_overrides.md) were not respected. [#656](https://github.com/wez/wezterm/issues/656)
|
||||
|
||||
### 20210405-110924-a5bb5be8
|
||||
|
||||
|
@ -280,7 +280,7 @@ impl WindowCallbacks for TermWindow {
|
||||
is_full_screen: self.is_full_screen,
|
||||
terminal_size: self.terminal_size.clone(),
|
||||
render_state,
|
||||
input_map: InputMap::new(),
|
||||
input_map: InputMap::new(&config),
|
||||
leader_is_down: None,
|
||||
show_tab_bar: self.show_tab_bar,
|
||||
show_scroll_bar: self.show_scroll_bar,
|
||||
@ -507,7 +507,7 @@ impl TermWindow {
|
||||
is_full_screen: false,
|
||||
terminal_size,
|
||||
render_state,
|
||||
input_map: InputMap::new(),
|
||||
input_map: InputMap::new(&config),
|
||||
leader_is_down: None,
|
||||
show_tab_bar,
|
||||
show_scroll_bar: config.enable_scroll_bar,
|
||||
@ -945,7 +945,7 @@ impl TermWindow {
|
||||
|
||||
self.show_scroll_bar = config.enable_scroll_bar;
|
||||
self.shape_cache.borrow_mut().clear();
|
||||
self.input_map = InputMap::new();
|
||||
self.input_map = InputMap::new(&config);
|
||||
self.leader_is_down = None;
|
||||
let dimensions = self.dimensions;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user