me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename fetch_native_handle to run_with_handle in window

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-02-07 09:47:15 +01:00
parent 7105992228
commit f18a81451f
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
4 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
winit/src/application.rs
View file

@ -23,8 +23,6 @@ use crate::{Clipboard, Error, Proxy, Settings};
use futures::channel::mpsc;
use winit::raw_window_handle::HasWindowHandle;
use std::mem::ManuallyDrop;
use std::sync::Arc;
@ -785,13 +783,16 @@ pub fn run_command<A, C, E>(
.send_event(tag(window.id().into()))
.expect("Send message to event loop");
}
window::Action::FetchNativeHandle(_id, tag) => {
proxy
.send_event(tag(&window
.window_handle()
.expect("Missing window handle")))
.expect("Send message to event loop");
window::Action::RunWithHandle(_id, tag) => {
use window::raw_window_handle::HasWindowHandle;
if let Ok(handle) = window.window_handle() {
proxy
.send_event(tag(&handle))
.expect("Send message to event loop");
}
}
window::Action::Screenshot(_id, tag) => {
let bytes = compositor.screenshot(
renderer,

22
winit/src/multi_window.rs
View file

@ -22,8 +22,6 @@ use crate::runtime::Debug;
use crate::style::application::StyleSheet;
use crate::{Clipboard, Error, Proxy, Settings};
use winit::raw_window_handle::HasWindowHandle;
use std::collections::HashMap;
use std::mem::ManuallyDrop;
use std::sync::Arc;
@ -1000,7 +998,7 @@ fn run_command<A, C, E>(
proxy
.send_event(tag(mode))
.expect("Event loop doesn't exist.");
.expect("Send message to event loop");
}
}
window::Action::ToggleMaximize(id) => {
@ -1036,17 +1034,19 @@ fn run_command<A, C, E>(
if let Some(window) = window_manager.get_mut(id) {
proxy
.send_event(tag(window.raw.id().into()))
.expect("Event loop doesn't exist.");
.expect("Send message to event loop");
}
}
window::Action::FetchNativeHandle(id, tag) => {
if let Some(window) = window_manager.get_mut(id) {
window::Action::RunWithHandle(id, tag) => {
use window::raw_window_handle::HasWindowHandle;
if let Some(handle) = window_manager
.get_mut(id)
.and_then(|window| window.raw.window_handle().ok())
{
proxy
.send_event(tag(&window
.raw
.window_handle()
.expect("Missing window handle.")))
.expect("Event loop doesn't exist.");
.send_event(tag(&handle))
.expect("Send message to event loop");
}
}
window::Action::Screenshot(id, tag) => {