From ae10adda74320e8098bfeb401f12a278e1e7b3e2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 2 Feb 2025 20:45:29 +0100
Subject: Refactor and simplify `input_method` API

---
 widget/src/action.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'widget/src/action.rs')

diff --git a/widget/src/action.rs b/widget/src/action.rs
index 1dd3a787..cc31e76a 100644
--- a/widget/src/action.rs
+++ b/widget/src/action.rs
@@ -6,7 +6,7 @@ use crate::core::window;
 #[derive(Debug, Clone)]
 pub struct Action<Message> {
     message_to_publish: Option<Message>,
-    redraw_request: Option<window::RedrawRequest>,
+    redraw_request: window::RedrawRequest,
     event_status: event::Status,
 }
 
@@ -14,7 +14,7 @@ impl<Message> Action<Message> {
     fn new() -> Self {
         Self {
             message_to_publish: None,
-            redraw_request: None,
+            redraw_request: window::RedrawRequest::Wait,
             event_status: event::Status::Ignored,
         }
     }
@@ -46,7 +46,7 @@ impl<Message> Action<Message> {
     /// soon as possible; without publishing any `Message`.
     pub fn request_redraw() -> Self {
         Self {
-            redraw_request: Some(window::RedrawRequest::NextFrame),
+            redraw_request: window::RedrawRequest::NextFrame,
             ..Self::new()
         }
     }
@@ -58,7 +58,7 @@ impl<Message> Action<Message> {
     /// blinking caret on a text input.
     pub fn request_redraw_at(at: Instant) -> Self {
         Self {
-            redraw_request: Some(window::RedrawRequest::At(at)),
+            redraw_request: window::RedrawRequest::At(at),
             ..Self::new()
         }
     }
@@ -75,11 +75,7 @@ impl<Message> Action<Message> {
     /// widget implementations.
     pub fn into_inner(
         self,
-    ) -> (
-        Option<Message>,
-        Option<window::RedrawRequest>,
-        event::Status,
-    ) {
+    ) -> (Option<Message>, window::RedrawRequest, event::Status) {
         (
             self.message_to_publish,
             self.redraw_request,
-- 
cgit