Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make size/position types generic over pixel type #1277

Merged
merged 12 commits into from Nov 14, 2019
Merged

Make size/position types generic over pixel type #1277

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c0ea815
Begin implementing DPI generics
Osspial Nov 1, 2019
4c72d75
Fix multithreaded example
Osspial Nov 14, 2019
92cc92c
Format
Osspial Nov 14, 2019
478abdb
Fix serde test
Osspial Nov 14, 2019
239ae4d
hopefully fix most of the errors
Osspial Nov 14, 2019
e59dccb
Fix dpi module errors
Osspial Nov 14, 2019
13a8ae9
More error fixings
Osspial Nov 14, 2019
ea589c4
Format
Osspial Nov 14, 2019
bb4eee4
fix macos errors
Osspial Nov 14, 2019
b6944b6
Another error pass
Osspial Nov 14, 2019
c90dc93
Replace bad type signatures
Osspial Nov 14, 2019
da0b29e
more fixins
Osspial Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 10 additions & 15 deletions examples/multithreaded.rs
View file
Open in desktop
Expand Up @@ -5,14 +5,14 @@ fn main() {
use std::{collections::HashMap, sync::mpsc, thread, time::Duration};

use winit::{
dpi::{PhysicalPosition, PhysicalSize, Position, Size},
dpi::{PhysicalPosition, PhysicalSize, Position, Size},
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
event_loop::{ControlFlow, EventLoop},
window::{CursorIcon, Fullscreen, WindowBuilder},
};

const WINDOW_COUNT: usize = 3;
const WINDOW_SIZE: PhysicalSize = PhysicalSize::new(600, 400);
const WINDOW_SIZE: PhysicalSize<u32> = PhysicalSize::new(600, 400);

env_logger::init();
let event_loop = EventLoop::new();
Expand Down Expand Up @@ -108,30 +108,25 @@ fn main() {
M => window.set_maximized(state),
P => window.set_outer_position({
let mut position = window.outer_position().unwrap();
let sign = if state { 1.0 } else { -1.0 };
position.x += 10.0 * sign;
position.y += 10.0 * sign;
let sign = if state { 1 } else { -1 };
position.x += 10 * sign;
position.y += 10 * sign;
position
}),
Q => window.request_redraw(),
R => window.set_resizable(state),
S => window.set_inner_size(match state {
true => {
PhysicalSize::new(
WINDOW_SIZE.width + 100,
WINDOW_SIZE.height + 100,
)
}
true => PhysicalSize::new(
WINDOW_SIZE.width + 100,
WINDOW_SIZE.height + 100,
),
false => WINDOW_SIZE,
}),
W => {
if let Size::Physical(size) = WINDOW_SIZE.into() {
window
.set_cursor_position(Position::Physical(
PhysicalPosition::new(
size.width as f64 / 2.0,
size.height as f64 / 2.0,
),
PhysicalPosition::new(size.width / 2, size.height / 2),
))
.unwrap()
}
Expand Down