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

fix: filter out events with no window id, if the window id is needed #179

Merged
merged 1 commit into from
Oct 21, 2024
Merged

fix: filter out events with no window id, if the window id is needed #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions winit/src/program.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use crate::futures::{Executor, Runtime};
use crate::graphics;
use crate::graphics::{compositor, Compositor};
use crate::platform_specific;

Check warning on line 29 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unused import: `crate::platform_specific`

Check warning on line 29 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unused import: `crate::platform_specific`

Check warning on line 29 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unused import: `crate::platform_specific`

Check warning on line 29 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unused import: `crate::platform_specific`
use crate::runtime::user_interface::{self, UserInterface};
use crate::runtime::Debug;
use crate::runtime::{self, Action, Task};
Expand Down Expand Up @@ -378,8 +378,8 @@

#[cfg(target_arch = "wasm32")]
{
use winit::platform::web::WindowExtWebSys;

Check failure on line 381 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::WindowExtWebSys`

Check failure on line 381 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::WindowExtWebSys`

Check failure on line 381 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::WindowExtWebSys`

Check failure on line 381 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::WindowExtWebSys`
self.canvas = window.canvas();

Check failure on line 382 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `canvas` found for struct `std::sync::Arc<dyn winit::window::Window>` in the current scope

Check failure on line 382 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `canvas` found for struct `std::sync::Arc<dyn winit::window::Window>` in the current scope

Check failure on line 382 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `canvas` found for struct `std::sync::Arc<dyn winit::window::Window>` in the current scope

Check failure on line 382 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `canvas` found for struct `std::sync::Arc<dyn winit::window::Window>` in the current scope
}

let finish_boot = async move {
Expand Down Expand Up @@ -495,14 +495,14 @@

#[cfg(target_arch = "wasm32")]
let window_attributes = {
use winit::platform::web::WindowAttributesExtWebSys;

Check failure on line 498 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::WindowAttributesExtWebSys`

Check failure on line 498 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::WindowAttributesExtWebSys`

Check failure on line 498 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::WindowAttributesExtWebSys`

Check failure on line 498 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::WindowAttributesExtWebSys`
window_attributes
.with_canvas(self.canvas.take())

Check failure on line 500 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `with_canvas` found for struct `WindowAttributes` in the current scope

Check failure on line 500 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `with_canvas` found for struct `WindowAttributes` in the current scope

Check failure on line 500 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `with_canvas` found for struct `WindowAttributes` in the current scope

Check failure on line 500 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `with_canvas` found for struct `WindowAttributes` in the current scope
};

log::info!("Window attributes for id `{id:#?}`: {window_attributes:#?}");

let window = Arc::from(

Check failure on line 505 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

type annotations needed for `std::sync::Arc<_, _>`

Check failure on line 505 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

type annotations needed for `std::sync::Arc<_, _>`

Check failure on line 505 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

type annotations needed for `std::sync::Arc<_, _>`

Check failure on line 505 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

type annotations needed for `std::sync::Arc<_, _>`
event_loop
.create_window(window_attributes)
.expect("Create window"),
Expand All @@ -510,7 +510,7 @@

#[cfg(target_arch = "wasm32")]
{
use winit::platform::web::WindowExtWebSys;

Check failure on line 513 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::WindowExtWebSys`

Check failure on line 513 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::WindowExtWebSys`

Check failure on line 513 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::WindowExtWebSys`

Check failure on line 513 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::WindowExtWebSys`

let canvas = window
.canvas()
Expand Down Expand Up @@ -630,8 +630,8 @@

#[cfg(target_arch = "wasm32")]
{
use winit::platform::web::EventLoopExtWebSys;

Check failure on line 633 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::EventLoopExtWebSys`

Check failure on line 633 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::EventLoopExtWebSys`

Check failure on line 633 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unresolved import `winit::platform::web::EventLoopExtWebSys`

Check failure on line 633 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unresolved import `winit::platform::web::EventLoopExtWebSys`
let _ = event_loop.spawn_app(runner);

Check failure on line 634 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `spawn_app` found for struct `EventLoop` in the current scope

Check failure on line 634 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `spawn_app` found for struct `EventLoop` in the current scope

Check failure on line 634 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

no method named `spawn_app` found for struct `EventLoop` in the current scope

Check failure on line 634 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

no method named `spawn_app` found for struct `EventLoop` in the current scope

Ok(())
}
Expand Down Expand Up @@ -693,7 +693,7 @@
boot: oneshot::Receiver<Boot<C>>,
mut event_receiver: mpsc::UnboundedReceiver<Event<P::Message>>,
mut control_sender: mpsc::UnboundedSender<Control>,
display_handle: OwnedDisplayHandle,

Check warning on line 696 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unused variable: `display_handle`

Check warning on line 696 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unused variable: `display_handle`

Check warning on line 696 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unused variable: `display_handle`

Check warning on line 696 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unused variable: `display_handle`
is_daemon: bool,
) where
P: Program + 'static,
Expand All @@ -705,7 +705,7 @@

let Boot {
mut compositor,
is_wayland,

Check warning on line 708 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unused variable: `is_wayland`

Check warning on line 708 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unused variable: `is_wayland`

Check warning on line 708 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unused variable: `is_wayland`

Check warning on line 708 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unused variable: `is_wayland`
} = boot.await.expect("Receive boot");

let mut platform_specific_handler =
Expand Down Expand Up @@ -1230,7 +1230,7 @@
{
let logical_size = window.state.logical_size();
debug.layout_started();
let mut ui = user_interfaces

Check warning on line 1233 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

variable does not need to be mutable

Check warning on line 1233 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

variable does not need to be mutable

Check warning on line 1233 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

variable does not need to be mutable

Check warning on line 1233 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

variable does not need to be mutable
.remove(&id)
.expect("Remove user interface")
.relayout(logical_size, &mut window.renderer);
Expand Down Expand Up @@ -1500,7 +1500,7 @@
}
}
}
_ => {}

Check warning on line 1503 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unreachable pattern

Check warning on line 1503 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unreachable pattern

Check warning on line 1503 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / web 

unreachable pattern

Check warning on line 1503 in winit/src/program.rs

View workflow job for this annotation

GitHub Actions / wasm 

unreachable pattern
}
}
Event::AboutToWait => {
Expand Down Expand Up @@ -1611,6 +1611,16 @@
}

for (id, event) in events.drain(..) {
if id.is_none()
&& matches!(
event,
core::Event::Keyboard(_)
| core::Event::Touch(_)
| core::Event::Mouse(_)
)
{
continue;
}
runtime.broadcast(subscription::Event::Interaction {
window: id.unwrap_or(window::Id::NONE),
event,
Expand Down
Loading