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

Rename fetch_location to fetch_position

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-02-22 09:19:51 +01:00
parent 59885e9a36
commit d6454b5d0c
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
4 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

23
winit/src/application.rs
View file

@ -767,19 +767,14 @@ pub fn run_command<A, C, E>(
window::Action::Minimize(_id, minimized) => {
window.set_minimized(minimized);
}
window::Action::Move(_id, position) => {
window.set_outer_position(winit::dpi::LogicalPosition {
x: position.x,
y: position.y,
});
}
window::Action::FetchLocation(_id, callback) => {
window::Action::FetchPosition(_id, callback) => {
let position = window
.inner_position()
.map(|p| {
let pos =
p.to_logical::<f32>(window.scale_factor());
crate::core::Point::new(pos.x, pos.y)
.map(|position| {
let position = position
.to_logical::<f32>(window.scale_factor());
crate::core::Point::new(position.x, position.y)
})
.ok();
@ -787,6 +782,12 @@ pub fn run_command<A, C, E>(
.send_event(callback(position))
.expect("Send message to event loop");
}
window::Action::Move(_id, position) => {
window.set_outer_position(winit::dpi::LogicalPosition {
x: position.x,
y: position.y,
});
}
window::Action::ChangeMode(_id, mode) => {
window.set_visible(conversion::visible(mode));
window.set_fullscreen(conversion::fullscreen(

37
winit/src/multi_window.rs
View file

@ -993,6 +993,25 @@ fn run_command<A, C, E>(
window.raw.set_minimized(minimized);
}
}
window::Action::FetchPosition(id, callback) => {
if let Some(window) = window_manager.get_mut(id) {
let position = window
.raw
.inner_position()
.map(|position| {
let position = position.to_logical::<f32>(
window.raw.scale_factor(),
);
crate::core::Point::new(position.x, position.y)
})
.ok();
proxy
.send_event(callback(position))
.expect("Send message to event loop");
}
}
window::Action::Move(id, position) => {
if let Some(window) = window_manager.get_mut(id) {
window.raw.set_outer_position(
@ -1003,24 +1022,6 @@ fn run_command<A, C, E>(
);
}
}
window::Action::FetchLocation(id, callback) => {
if let Some(window) = window_manager.get_mut(id) {
let position = window
.raw
.inner_position()
.map(|p| {
let pos = p.to_logical::<f32>(
window.raw.scale_factor(),
);
crate::core::Point::new(pos.x, pos.y)
})
.ok();
proxy
.send_event(callback(position))
.expect("Send message to event loop");
}
}
window::Action::ChangeMode(id, mode) => {
if let Some(window) = window_manager.get_mut(id) {
window.raw.set_visible(conversion::visible(mode));