From c5f4bebeda8d6ef10efade7933a5ee58f06b62d1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 20 Jun 2024 01:13:42 +0200
Subject: Remove `window::Id::MAIN` constant
---
examples/events/src/main.rs | 4 ++--
examples/exit/src/main.rs | 2 +-
examples/multi_window/src/main.rs | 2 +-
examples/screenshot/src/main.rs | 3 ++-
examples/todos/src/main.rs | 7 ++++---
5 files changed, 10 insertions(+), 8 deletions(-)
(limited to 'examples')
diff --git a/examples/events/src/main.rs b/examples/events/src/main.rs
index 4f0f07b0..2cd3c5d8 100644
--- a/examples/events/src/main.rs
+++ b/examples/events/src/main.rs
@@ -38,7 +38,7 @@ impl Events {
}
Message::EventOccurred(event) => {
if let Event::Window(window::Event::CloseRequested) = event {
- window::close(window::Id::MAIN)
+ window::get_latest().and_then(window::close)
} else {
Task::none()
}
@@ -48,7 +48,7 @@ impl Events {
Task::none()
}
- Message::Exit => window::close(window::Id::MAIN),
+ Message::Exit => window::get_latest().and_then(window::close),
}
}
diff --git a/examples/exit/src/main.rs b/examples/exit/src/main.rs
index b998016e..1f108df2 100644
--- a/examples/exit/src/main.rs
+++ b/examples/exit/src/main.rs
@@ -20,7 +20,7 @@ enum Message {
impl Exit {
fn update(&mut self, message: Message) -> Task<Message> {
match message {
- Message::Confirm => window::close(window::Id::MAIN),
+ Message::Confirm => window::get_latest().and_then(window::close),
Message::Exit => {
self.show_confirm = true;
diff --git a/examples/multi_window/src/main.rs b/examples/multi_window/src/main.rs
index dfb816cf..98e753ab 100644
--- a/examples/multi_window/src/main.rs
+++ b/examples/multi_window/src/main.rs
@@ -57,7 +57,7 @@ impl Example {
return Task::none();
};
- window::fetch_position(*last_window)
+ window::get_position(*last_window)
.then(|last_position| {
let position = last_position.map_or(
window::Position::Default,
diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 1ea53e8f..acde8367 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -47,7 +47,8 @@ impl Example {
fn update(&mut self, message: Message) -> Task<Message> {
match message {
Message::Screenshot => {
- return iced::window::screenshot(window::Id::MAIN)
+ return window::get_latest()
+ .and_then(window::screenshot)
.map(Message::Screenshotted);
}
Message::Screenshotted(screenshot) => {
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index a834c946..6ed50d31 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -149,9 +149,10 @@ impl Todos {
widget::focus_next()
}
}
- Message::ToggleFullscreen(mode) => {
- window::change_mode(window::Id::MAIN, mode)
- }
+ Message::ToggleFullscreen(mode) => window::get_latest()
+ .and_then(move |window| {
+ window::change_mode(window, mode)
+ }),
Message::Loaded(_) => Command::none(),
};
--
cgit