summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-01-15 18:21:44 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-01-15 18:21:44 +0100
commit45dc02e9bd0b4f2c6cc65781b850f460cddf6171 (patch)
treeaa9c1c3808f9831a930a803b9dc7ba894248cfc1
parent0b140488b425a7d1fd45ca41592de25b28d3ac17 (diff)
downloadiced-45dc02e9bd0b4f2c6cc65781b850f460cddf6171.tar.gz
iced-45dc02e9bd0b4f2c6cc65781b850f460cddf6171.tar.bz2
iced-45dc02e9bd0b4f2c6cc65781b850f460cddf6171.zip
Split `window::Event::Focused` into two variants
-rw-r--r--native/src/window/event.rs11
-rw-r--r--winit/src/conversion.rs8
2 files changed, 12 insertions, 7 deletions
diff --git a/native/src/window/event.rs b/native/src/window/event.rs
index d649760b..fc746781 100644
--- a/native/src/window/event.rs
+++ b/native/src/window/event.rs
@@ -3,7 +3,7 @@ use std::path::PathBuf;
/// A window-related event.
#[derive(PartialEq, Clone, Debug)]
pub enum Event {
- /// A window was resized
+ /// A window was resized.
Resized {
/// The new width of the window (in units)
width: u32,
@@ -12,6 +12,12 @@ pub enum Event {
height: u32,
},
+ /// A window was focused.
+ Focused,
+
+ /// A window was unfocused.
+ Unfocused,
+
/// A file is being hovered over the window.
///
/// When the user hovers multiple files at once, this event will be emitted
@@ -29,7 +35,4 @@ pub enum Event {
/// There will be a single `FilesHoveredLeft` event triggered even if
/// multiple files were hovered.
FilesHoveredLeft,
-
- /// A window was focused or not
- Focused(bool),
}
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 5265b844..0e04b35d 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -109,6 +109,11 @@ pub fn window_event(
WindowEvent::ModifiersChanged(new_modifiers) => Some(Event::Keyboard(
keyboard::Event::ModifiersChanged(self::modifiers(*new_modifiers)),
)),
+ WindowEvent::Focused(focused) => Some(Event::Window(if *focused {
+ window::Event::Focused
+ } else {
+ window::Event::Unfocused
+ })),
WindowEvent::HoveredFile(path) => {
Some(Event::Window(window::Event::FileHovered(path.clone())))
}
@@ -121,9 +126,6 @@ pub fn window_event(
WindowEvent::Touch(touch) => {
Some(Event::Touch(touch_event(*touch, scale_factor)))
}
- WindowEvent::Focused(focused) => {
- Some(Event::Window(window::Event::Focused(*focused)))
- }
_ => None,
}
}