Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove useless pref

Browse source
This commit is contained in:
Paul Rouget 2018-03-07 10:20:10 +01:00
parent 1cdba8843d
commit aa72b8783d
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ports/servo/browser.rs
View file

@ -83,10 +83,8 @@ impl Browser {
fn handle_key_from_window(&mut self, ch: Option<char>, key: Key, state: KeyState, mods: KeyModifiers) { fn handle_key_from_window(&mut self, ch: Option<char>, key: Key, state: KeyState, mods: KeyModifiers) {
match (mods, ch, key) { match (mods, ch, key) {
(CMD_OR_CONTROL, Some('r'), _) => { (CMD_OR_CONTROL, Some('r'), _) => {
if let Some(true) = PREFS.get("shell.builtin-key-shortcuts.enabled").as_boolean() { if let Some(id) = self.browser_id {
if let Some(id) = self.browser_id { self.event_queue.push(WindowEvent::Reload(id));
self.event_queue.push(WindowEvent::Reload(id));
}
} }
} }
(CMD_OR_CONTROL, Some('l'), _) => { (CMD_OR_CONTROL, Some('l'), _) => {
@ -105,9 +103,7 @@ impl Browser {
} }
} }
(CMD_OR_CONTROL, Some('q'), _) => { (CMD_OR_CONTROL, Some('q'), _) => {
if let Some(true) = PREFS.get("shell.builtin-key-shortcuts.enabled").as_boolean() { self.event_queue.push(WindowEvent::Quit);
self.event_queue.push(WindowEvent::Quit);
}
} }
(_, Some('3'), _) => if mods ^ KeyModifiers::CONTROL == KeyModifiers::SHIFT { (_, Some('3'), _) => if mods ^ KeyModifiers::CONTROL == KeyModifiers::SHIFT {
self.event_queue.push(WindowEvent::CaptureWebRender); self.event_queue.push(WindowEvent::CaptureWebRender);
@ -137,9 +133,7 @@ impl Browser {
} }
} }
(KeyModifiers::NONE, None, Key::Escape) => { (KeyModifiers::NONE, None, Key::Escape) => {
if let Some(true) = PREFS.get("shell.builtin-key-shortcuts.enabled").as_boolean() { self.event_queue.push(WindowEvent::Quit);
self.event_queue.push(WindowEvent::Quit);
}
} }
_ => { _ => {
let event = self.platform_handle_key(key, mods); let event = self.platform_handle_key(key, mods);

1
resources/prefs.json
View file

@ -63,7 +63,6 @@
"network.http-cache.disabled": false, "network.http-cache.disabled": false,
"network.mime.sniff": false, "network.mime.sniff": false,
"session-history.max-length": 20, "session-history.max-length": 20,
"shell.builtin-key-shortcuts.enabled": true,
"shell.homepage": "https://servo.org", "shell.homepage": "https://servo.org",
"shell.keep_screen_on.enabled": false, "shell.keep_screen_on.enabled": false,
"shell.native-orientation": "both", "shell.native-orientation": "both",