From d53ccc857da4d4cda769904342aeb5a82a64f146 Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Wed, 12 Jul 2023 19:21:05 -0700
Subject: refactored window storage; new helper window events (Destroyed,
 Created); clippy + fmt;

---
 examples/screenshot/src/main.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'examples/screenshot/src/main.rs')

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 83824535..7658384b 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -1,8 +1,8 @@
-use iced::alignment;
 use iced::keyboard::KeyCode;
 use iced::theme::{Button, Container};
 use iced::widget::{button, column, container, image, row, text, text_input};
 use iced::window::screenshot::{self, Screenshot};
+use iced::{alignment, window};
 use iced::{
     event, executor, keyboard, subscription, Alignment, Application, Command,
     ContentFit, Element, Event, Length, Rectangle, Renderer, Subscription,
@@ -71,7 +71,10 @@ impl Application for Example {
     fn update(&mut self, message: Self::Message) -> Command<Self::Message> {
         match message {
             Message::Screenshot => {
-                return iced::window::screenshot(Message::ScreenshotData);
+                return iced::window::screenshot(
+                    window::Id::MAIN,
+                    Message::ScreenshotData,
+                );
             }
             Message::ScreenshotData(screenshot) => {
                 self.screenshot = Some(screenshot);
-- 
cgit 


From 54e6d2b5fa1fe29e2e3588b51f6cfff36563cefc Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 18 Oct 2023 17:49:19 -0500
Subject: Fix lint in `screenshot` example

---
 examples/screenshot/src/main.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'examples/screenshot/src/main.rs')

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index ab0a2ae3..f781a401 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -298,10 +298,7 @@ fn numeric_input(
 ) -> Element<'_, Option<u32>> {
     text_input(
         placeholder,
-        &value
-            .as_ref()
-            .map(ToString::to_string)
-            .unwrap_or_else(String::new),
+        &value.as_ref().map(ToString::to_string).unwrap_or_default(),
     )
     .on_input(move |text| {
         if text.is_empty() {
-- 
cgit 


From 64d1ce5532f55d152fa5819532a138da2dca1a39 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 16 Jan 2024 13:28:00 +0100
Subject: Refactor `KeyCode` into `Key` and `Location`

---
 examples/screenshot/src/main.rs | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'examples/screenshot/src/main.rs')

diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 20d34be6..6955551e 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -1,11 +1,13 @@
-use iced::keyboard::KeyCode;
-use iced::theme::{Button, Container};
+use iced::alignment;
+use iced::executor;
+use iced::keyboard;
+use iced::theme;
 use iced::widget::{button, column, container, image, row, text, text_input};
+use iced::window;
 use iced::window::screenshot::{self, Screenshot};
-use iced::{alignment, window};
 use iced::{
-    event, executor, keyboard, Alignment, Application, Command, ContentFit,
-    Element, Event, Length, Rectangle, Renderer, Subscription, Theme,
+    Alignment, Application, Command, ContentFit, Element, Length, Rectangle,
+    Renderer, Subscription, Theme,
 };
 
 use ::image as img;
@@ -147,7 +149,7 @@ impl Application for Example {
 
         let image = container(image)
             .padding(10)
-            .style(Container::Box)
+            .style(theme::Container::Box)
             .width(Length::FillPortion(2))
             .height(Length::Fill)
             .center_x()
@@ -202,9 +204,10 @@ impl Application for Example {
                         self.screenshot.is_some().then(|| Message::Png),
                     )
                 } else {
-                    button(centered_text("Saving...")).style(Button::Secondary)
+                    button(centered_text("Saving..."))
+                        .style(theme::Button::Secondary)
                 }
-                .style(Button::Secondary)
+                .style(theme::Button::Secondary)
                 .padding([10, 20, 10, 20])
                 .width(Length::Fill)
             ]
@@ -213,7 +216,7 @@ impl Application for Example {
                 crop_controls,
                 button(centered_text("Crop"))
                     .on_press(Message::Crop)
-                    .style(Button::Destructive)
+                    .style(theme::Button::Destructive)
                     .padding([10, 20, 10, 20])
                     .width(Length::Fill),
             ]
@@ -256,16 +259,10 @@ impl Application for Example {
     }
 
     fn subscription(&self) -> Subscription<Self::Message> {
-        event::listen_with(|event, status| {
-            if let event::Status::Captured = status {
-                return None;
-            }
+        use keyboard::key;
 
-            if let Event::Keyboard(keyboard::Event::KeyPressed {
-                key_code: KeyCode::F5,
-                ..
-            }) = event
-            {
+        keyboard::on_key_press(|key, _modifiers| {
+            if let keyboard::Key::Named(key::Named::F5) = key {
                 Some(Message::Screenshot)
             } else {
                 None
-- 
cgit