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

auto merge of #4419 : glennw/servo/fix-glutin-esc, r=metajack

Browse source
This commit is contained in:
bors-servo 2014-12-18 01:00:57 -07:00
commit d7b3900431
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ports/glutin/window.rs
View file

@ -230,12 +230,12 @@ impl WindowMethods for Window {
#[cfg(target_os="linux")]
fn native_metadata(&self) -> NativeGraphicsMetadata {
match self.glutin {
Windowed(ref window) => {
WindowHandle::Windowed(ref window) => {
NativeGraphicsMetadata {
display: unsafe { window.platform_display() }
}
}
Headless(_) => {
WindowHandle::Headless(_) => {
NativeGraphicsMetadata {
display: ptr::null_mut()
}
@ -264,8 +264,6 @@ impl WindowMethods for Window {
/// Helper function to handle keyboard events.
fn handle_key(&self, key: Key, mods: constellation_msg::KeyModifiers) {
match key {
// TODO(negge): handle window close event
Key::Escape => {},
Key::Equal if mods.contains(CONTROL) => { // Ctrl-+
self.event_queue.borrow_mut().push(Zoom(1.1));
}
@ -368,6 +366,7 @@ impl Window {
(_, VirtualKeyCode::RShift) => self.toggle_modifier(RIGHT_SHIFT),
(_, VirtualKeyCode::LAlt) => self.toggle_modifier(LEFT_ALT),
(_, VirtualKeyCode::RAlt) => self.toggle_modifier(RIGHT_ALT),
(ElementState::Pressed, VirtualKeyCode::Escape) => return true,
(ElementState::Pressed, key_code) => {
match glutin_key_to_script_key(key_code) {
Ok(key) => {