fix winit build

macos-click-through
Gabby Grinslade 4 years ago
parent c63b054521
commit 38c5538186

@ -59,7 +59,11 @@ fn build_nvim_cmd() -> Command {
} }
#[cfg(windows)] #[cfg(windows)]
if env::args().any(|arg| arg == "--wsl") { if env::args().any(|arg| arg == "--wsl") {
if let Ok(output) = std::process::Command::new("wsl").arg("which").arg("nvim").output() { if let Ok(output) = std::process::Command::new("wsl")
.arg("which")
.arg("nvim")
.output()
{
if output.status.success() { if output.status.success() {
let path = String::from_utf8(output.stdout).unwrap(); let path = String::from_utf8(output.stdout).unwrap();
let mut cmd = Command::new("wsl"); let mut cmd = Command::new("wsl");

@ -9,13 +9,18 @@ impl From<Option<ModifiersState>> for Modifiers {
fn from(state: Option<ModifiersState>) -> Modifiers { fn from(state: Option<ModifiersState>) -> Modifiers {
if let Some(modifiers) = state { if let Some(modifiers) = state {
Modifiers { Modifiers {
shift: state.shift(), shift: modifiers.shift(),
control: state.ctrl(), control: modifiers.ctrl(),
meta: state.alt(), meta: modifiers.alt(),
logo: state.logo(), logo: modifiers.logo(),
} }
} else { } else {
Modifiers::new(false, false, false, false) Modifiers {
shift: false,
control: false,
meta: false,
logo: false,
}
} }
} }
} }

Loading…
Cancel
Save