Update glutin to version 0.20

Fixes #458.
Fixes #1681.
This commit is contained in:
Christian Duerr 2019-03-14 20:06:38 +00:00 committed by GitHub
parent b1032bcc6b
commit 0f96a62218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 438 additions and 344 deletions

View File

@ -36,6 +36,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
working directory as long as linprocfs(5) is mounted on `/compat/linux/proc`
- Fix lingering Alacritty window after child process has exited
- Growing the terminal while scrolled up will no longer move the content down
- Support for alternate keyboard layouts on macOS
- Slow startup time on some X11 systems
- The AltGr key no longer sends escapes (like Alt)
## Version 0.2.9

763
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -42,7 +42,7 @@ clap = "2"
fnv = "1"
unicode-width = "0.1"
arraydeque = "0.4"
glutin = { version = "0.19", features = ["icon_loading"] }
glutin = { version = "0.20", features = ["icon_loading"] }
env_logger = "0.6.0"
base64 = "0.10.0"
static_assertions = "0.3.0"
@ -67,7 +67,7 @@ dunce = "0.1"
dirs = "1.0"
widestring = "0.4"
mio-anonymous-pipes = "0.1"
image = "0.20.0"
image = "0.21.0"
[target.'cfg(target_os = "macos")'.dependencies]
objc = "0.2.2"

View File

@ -15,7 +15,6 @@ use std::convert::From;
use std::fmt::Display;
use crate::gl;
use glutin::GlContext;
#[cfg(windows)]
use glutin::Icon;
#[cfg(windows)]
@ -23,6 +22,7 @@ use image::ImageFormat;
use glutin::{
self, ContextBuilder, ControlFlow, Event, EventsLoop,
MouseCursor as GlutinMouseCursor, WindowBuilder,
ContextTrait,
};
use glutin::dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
@ -54,7 +54,7 @@ type Result<T> = ::std::result::Result<T, Error>;
/// Wraps the underlying windowing library to provide a stable API in Alacritty
pub struct Window {
event_loop: EventsLoop,
window: glutin::GlWindow,
window: glutin::WindowedContext,
mouse_visible: bool,
/// Whether or not the window is the focused window.
@ -119,12 +119,12 @@ fn create_gl_window(
window: WindowBuilder,
event_loop: &EventsLoop,
srgb: bool,
) -> ::std::result::Result<glutin::GlWindow, glutin::CreationError> {
let context = ContextBuilder::new()
) -> ::std::result::Result<glutin::WindowedContext, glutin::CreationError> {
ContextBuilder::new()
.with_srgb(srgb)
.with_vsync(true)
.with_hardware_acceleration(None);
::glutin::GlWindow::new(window, context, event_loop)
.with_hardware_acceleration(None)
.build_windowed(window, event_loop)
}
impl Window {