michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump glutin dependency in the example 

The API of winit has changed quite a lot in their 0.20 release.
This commit is contained in:
Emmanuel Gil Peyrot 2020-02-04 21:51:25 +01:00
parent d2b8e2cd30
commit 03e3a9fded
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/canvas_glutin_minimal/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
gl = "0.6" gl = "0.6"
glutin = "0.21" glutin = "0.22"
[dependencies.pathfinder_canvas] [dependencies.pathfinder_canvas]
path = "../../canvas" path = "../../canvas"

24
examples/canvas_glutin_minimal/src/main.rs
View File

@ -11,8 +11,10 @@
//! Demonstrates how to use the Pathfinder canvas API with `glutin`. //! Demonstrates how to use the Pathfinder canvas API with `glutin`.
use glutin::dpi::PhysicalSize; use glutin::dpi::PhysicalSize;
use glutin::{ContextBuilder, ControlFlow, Event, EventsLoop, GlProfile, GlRequest, KeyboardInput}; use glutin::{ContextBuilder, GlProfile, GlRequest};
use glutin::{VirtualKeyCode, WindowBuilder, WindowEvent}; use glutin::event_loop::{ControlFlow, EventLoop};
use glutin::event::{Event, KeyboardInput, VirtualKeyCode, WindowEvent};
use glutin::window::WindowBuilder;
use pathfinder_canvas::{CanvasFontContext, CanvasRenderingContext2D, Path2D}; use pathfinder_canvas::{CanvasFontContext, CanvasRenderingContext2D, Path2D};
use pathfinder_color::ColorF; use pathfinder_color::ColorF;
use pathfinder_geometry::rect::RectF; use pathfinder_geometry::rect::RectF;
@ -27,15 +29,13 @@ use pathfinder_renderer::options::BuildOptions;
fn main() { fn main() {
// Calculate the right logical size of the window. // Calculate the right logical size of the window.
let mut event_loop = EventsLoop::new(); let event_loop = EventLoop::new();
let hidpi_factor = event_loop.get_primary_monitor().get_hidpi_factor();
let window_size = Vector2I::new(640, 480); let window_size = Vector2I::new(640, 480);
let physical_window_size = PhysicalSize::new(window_size.x() as f64, window_size.y() as f64); let physical_window_size = PhysicalSize::new(window_size.x() as f64, window_size.y() as f64);
let logical_window_size = physical_window_size.to_logical(hidpi_factor);
// Open a window. // Open a window.
let window_builder = WindowBuilder::new().with_title("Minimal example") let window_builder = WindowBuilder::new().with_title("Minimal example")
.with_dimensions(logical_window_size); .with_inner_size(physical_window_size);
// Create an OpenGL 3.x context for Pathfinder to use. // Create an OpenGL 3.x context for Pathfinder to use.
let gl_context = ContextBuilder::new().with_gl(GlRequest::Latest) let gl_context = ContextBuilder::new().with_gl(GlRequest::Latest)
@ -80,7 +80,7 @@ fn main() {
gl_context.swap_buffers().unwrap(); gl_context.swap_buffers().unwrap();
// Wait for a keypress. // Wait for a keypress.
event_loop.run_forever(|event| { event_loop.run(move |event, _, control_flow| {
match event { match event {
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } | Event::WindowEvent { event: WindowEvent::CloseRequested, .. } |
Event::WindowEvent { Event::WindowEvent {
@ -89,8 +89,12 @@ fn main() {
.. ..
}, },
.. ..
} => ControlFlow::Break, } => {
_ => ControlFlow::Continue, *control_flow = ControlFlow::Exit;
} },
_ => {
*control_flow = ControlFlow::Wait;
},
};
}) })
} }