migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-06-27 23:23:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change instances of "events_loop" to "event_loop"

Browse Source
This commit is contained in:
Osspial
2018-08-23 20:16:52 -04:00
parent 0f34408763
commit 8d8d9b7cd1
34 changed files with 137 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/platform_impl/windows/events_loop.rs → src/platform_impl/windows/event_loop.rs
View File

4
src/platform_impl/windows/mod.rs
View File

@@ -3,7 +3,7 @@
use winapi;
use winapi::shared::windef::HWND;
pub use self::events_loop::{EventLoop, EventLoopProxy};
pub use self::event_loop::{EventLoop, EventLoopProxy};
pub use self::monitor::MonitorId;
pub use self::window::Window;
@@ -54,7 +54,7 @@ unsafe impl Sync for WindowId {}
mod dpi;
mod drop_handler;
mod event;
mod events_loop;
mod event_loop;
mod icon;
mod monitor;
mod raw_input;

16
src/platform_impl/windows/window.rs
View File

@@ -23,8 +23,8 @@ use dpi::{LogicalPosition, LogicalSize, PhysicalSize};
use monitor::MonitorId as RootMonitorId;
use platform_impl::platform::{Cursor, PlatformSpecificWindowBuilderAttributes, WindowId};
use platform_impl::platform::dpi::{dpi_to_scale_factor, get_hwnd_dpi};
use platform_impl::platform::events_loop::{self, EventLoop, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID, REQUEST_REDRAW_NO_NEWEVENTS_MSG_ID};
use platform_impl::platform::events_loop::WindowState;
use platform_impl::platform::event_loop::{self, EventLoop, DESTROY_MSG_ID, INITIAL_DPI_MSG_ID, REQUEST_REDRAW_NO_NEWEVENTS_MSG_ID};
use platform_impl::platform::event_loop::WindowState;
use platform_impl::platform::icon::{self, IconType, WinIcon};
use platform_impl::platform::monitor;
use platform_impl::platform::raw_input::register_all_mice_and_keyboards_for_raw_input;
@@ -42,7 +42,7 @@ pub struct Window {
window_state: Arc<Mutex<WindowState>>,
// The events loop proxy.
thread_executor: events_loop::EventLoopThreadExecutor,
thread_executor: event_loop::EventLoopThreadExecutor,
}
// https://blogs.msdn.microsoft.com/oldnewthing/20131017-00/?p=2903
@@ -98,13 +98,13 @@ impl Window {
file_drop_handler
};
let subclass_input = events_loop::SubclassInput {
let subclass_input = event_loop::SubclassInput {
window_state: win.window_state.clone(),
event_loop_runner: event_loop.runner_shared.clone(),
file_drop_handler,
};
events_loop::subclass_window(win.window.0, subclass_input);
event_loop::subclass_window(win.window.0, subclass_input);
win
})
}
@@ -517,7 +517,7 @@ impl Window {
if window_state.fullscreen.is_none() || window_state.saved_window_info.is_none() {
let rect = util::get_window_rect(self.window.0).expect("`GetWindowRect` failed");
let dpi_factor = Some(window_state.dpi_factor);
window_state.saved_window_info = Some(events_loop::SavedWindowInfo {
window_state.saved_window_info = Some(event_loop::SavedWindowInfo {
style: winuser::GetWindowLongW(self.window.0, winuser::GWL_STYLE),
ex_style: winuser::GetWindowLongW(self.window.0, winuser::GWL_EXSTYLE),
rect,
@@ -852,7 +852,7 @@ pub unsafe fn adjust_size(
unsafe fn init<T>(
mut attributes: WindowAttributes,
mut pl_attribs: PlatformSpecificWindowBuilderAttributes,
event_loop: &events_loop::EventLoop<T>,
event_loop: &event_loop::EventLoop<T>,
) -> Result<Window, CreationError> {
let title = OsStr::new(&attributes.title)
.encode_wide()
@@ -1043,7 +1043,7 @@ unsafe fn init<T>(
.map(|logical_size| PhysicalSize::from_logical(logical_size, dpi_factor));
let min_size = attributes.min_dimensions
.map(|logical_size| PhysicalSize::from_logical(logical_size, dpi_factor));
let mut window_state = events_loop::WindowState {
let mut window_state = event_loop::WindowState {
max_size,
min_size,
dpi_factor,