aboutsummaryrefslogtreecommitdiff
path: root/src/display.rs
diff options
context:
space:
mode:
authorJoe Wilm <jwilm@users.noreply.github.com>2017-07-20 10:50:50 -0700
committerGitHub <noreply@github.com>2017-07-20 10:50:50 -0700
commit8e7dd009a4335e6d6673c1aabb2b92d27f86155c (patch)
tree9e1dddb26693ea2085f700d43ae9bc2d800df52d /src/display.rs
parentc8e4f366e740b98377bf6faf157af358b3bc70d2 (diff)
downloadalacritty-8e7dd009a4335e6d6673c1aabb2b92d27f86155c.tar.gz
alacritty-8e7dd009a4335e6d6673c1aabb2b92d27f86155c.zip
Update to latest Glutin/winit (#671)
* Update to latest Glutin/winit This *finally* gets us off the fork of Glutin we've been on for so long and will unblock a number of other items. Functionality should be the same as before. The update forced our hand on a compiler update. It's no longer feasible to pin on an old version. From now on, we require latest stable.
Diffstat (limited to 'src/display.rs')
-rw-r--r--src/display.rs14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/display.rs b/src/display.rs
index 00427e34..0f2c526f 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -211,7 +211,7 @@ impl Display {
// Clear screen
renderer.with_api(config, &size_info, 0. /* visual bell intensity */, |api| api.clear());
- let mut display = Display {
+ Ok(Display {
window: window,
renderer: renderer,
glyph_cache: glyph_cache,
@@ -220,16 +220,7 @@ impl Display {
rx: rx,
meter: Meter::new(),
size_info: size_info,
- };
-
- let resize_tx = display.resize_channel();
- let proxy = display.window.create_window_proxy();
- display.window.set_resize_callback(move |width, height| {
- let _ = resize_tx.send((width, height));
- proxy.wakeup_event_loop();
- });
-
- Ok(display)
+ })
}
#[inline]
@@ -267,6 +258,7 @@ impl Display {
item.on_resize(size)
}
+ self.window.resize(w, h);
self.renderer.resize(w as i32, h as i32);
}