@@ -229,8 +229,8 @@ fn main2() {
229
229
let ( res, mut resui) = resources:: Manager :: new ( ) ;
230
230
let resource_manager = Arc :: new ( RwLock :: new ( res) ) ;
231
231
232
- let mut events_loop = glutin:: EventsLoop :: new ( ) ;
233
- let window_builder = glutin:: WindowBuilder :: new ( )
232
+ let mut events_loop = glutin:: event_loop :: EventLoop :: new ( ) ;
233
+ let window_builder = glutin:: window :: WindowBuilder :: new ( )
234
234
. with_title ( "Stevenarella" )
235
235
. with_dimensions ( glutin:: dpi:: LogicalSize :: new ( 854.0 , 480.0 ) ) ;
236
236
let window = glutin:: ContextBuilder :: new ( )
@@ -268,7 +268,7 @@ fn main2() {
268
268
}
269
269
270
270
let textures = renderer. get_textures ( ) ;
271
- let dpi_factor = window. window ( ) . get_current_monitor ( ) . get_hidpi_factor ( ) ;
271
+ let dpi_factor = window. window ( ) . current_monitor ( ) . get_hidpi_factor ( ) ;
272
272
let default_protocol_version = protocol:: versions:: protocol_name_to_protocol_version (
273
273
opt. default_protocol_version . unwrap_or ( "" . to_string ( ) ) ) ;
274
274
let mut game = Game {
@@ -307,8 +307,8 @@ fn main2() {
307
307
let diff = now. duration_since ( last_frame) ;
308
308
last_frame = now;
309
309
let delta = ( diff. subsec_nanos ( ) as f64 ) / frame_time;
310
- let ( width, height) = window. window ( ) . get_inner_size ( ) . unwrap ( ) . into ( ) ;
311
- let ( physical_width, physical_height) = window. window ( ) . get_inner_size ( ) . unwrap ( ) . to_physical ( game. dpi_factor ) . into ( ) ;
310
+ let ( width, height) = window. window ( ) . inner_size ( ) . unwrap ( ) . into ( ) ;
311
+ let ( physical_width, physical_height) = window. window ( ) . inner_size ( ) . unwrap ( ) . to_physical ( game. dpi_factor ) . into ( ) ;
312
312
313
313
let version = {
314
314
let try_res = game. resource_manager . try_write ( ) ;
@@ -367,8 +367,8 @@ fn main2() {
367
367
fn handle_window_event ( window : & mut glutin:: WindowedContext < glutin:: PossiblyCurrent > ,
368
368
game : & mut Game ,
369
369
ui_container : & mut ui:: Container ,
370
- event : glutin:: Event ) {
371
- use glutin:: * ;
370
+ event : glutin:: event :: Event ) {
371
+ use glutin:: event :: * ;
372
372
match event {
373
373
Event :: DeviceEvent { event, ..} => match event {
374
374
DeviceEvent :: MouseMotion { delta : ( xrel, yrel) } => {
@@ -429,7 +429,7 @@ fn handle_window_event(window: &mut glutin::WindowedContext<glutin::PossiblyCurr
429
429
WindowEvent :: MouseInput { device_id : _, state, button, modifiers : _} => {
430
430
match ( state, button) {
431
431
( ElementState :: Released , MouseButton :: Left ) => {
432
- let ( width, height) = window. window ( ) . get_inner_size ( ) . unwrap ( ) . into ( ) ;
432
+ let ( width, height) = window. window ( ) . inner_size ( ) . unwrap ( ) . into ( ) ;
433
433
434
434
if game. server . is_connected ( ) && !game. focused && !game. screen_sys . is_current_closable ( ) {
435
435
game. focused = true ;
@@ -457,7 +457,7 @@ fn handle_window_event(window: &mut glutin::WindowedContext<glutin::PossiblyCurr
457
457
game. last_mouse_y = y;
458
458
459
459
if !game. focused {
460
- let ( width, height) = window. window ( ) . get_inner_size ( ) . unwrap ( ) . into ( ) ;
460
+ let ( width, height) = window. window ( ) . inner_size ( ) . unwrap ( ) . into ( ) ;
461
461
ui_container. hover_at ( game, x, y, width, height) ;
462
462
}
463
463
} ,
@@ -493,7 +493,7 @@ fn handle_window_event(window: &mut glutin::WindowedContext<glutin::PossiblyCurr
493
493
} ,
494
494
( ElementState :: Pressed , Some ( VirtualKeyCode :: F11 ) ) => {
495
495
if !game. is_fullscreen {
496
- window. window ( ) . set_fullscreen ( Some ( window. window ( ) . get_current_monitor ( ) ) ) ;
496
+ window. window ( ) . set_fullscreen ( Some ( window. window ( ) . current_monitor ( ) ) ) ;
497
497
} else {
498
498
window. window ( ) . set_fullscreen ( None ) ;
499
499
}
0 commit comments