summaryrefslogtreecommitdiffstats
path: root/winit
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-07-12 21:38:54 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2021-07-12 21:38:54 +0200
commit1428e9180ae9f4edbf22514bb74c5c7e9df9c712 (patch)
treea180d25cec5934b0216adf783311f9acce8e0cea /winit
parentc4552a72d43e5f79faa7c64634be539d81f995b9 (diff)
downloadiced-1428e9180ae9f4edbf22514bb74c5c7e9df9c712.tar.gz
iced-1428e9180ae9f4edbf22514bb74c5c7e9df9c712.tar.bz2
iced-1428e9180ae9f4edbf22514bb74c5c7e9df9c712.zip
Make `Menu` API a bit more functional
Diffstat (limited to 'winit')
-rw-r--r--winit/src/conversion.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index da09ac9d..02c21c59 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -3,10 +3,11 @@
//! [`winit`]: https://github.com/rust-windowing/winit
//! [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
use crate::keyboard;
+use crate::menu::{self, Menu};
use crate::mouse;
use crate::touch;
use crate::window;
-use crate::{Event, Menu, MenuEntry, Mode, Point};
+use crate::{Event, Mode, Point};
/// Converts a winit window event into an iced event.
pub fn window_event(
@@ -181,7 +182,7 @@ pub fn menu<Message>(menu: Menu<Message>) -> winit::window::Menu {
for item in menu.iter() {
match item {
- MenuEntry::Item {
+ menu::Entry::Item {
content, hotkey, ..
} => {
let hotkey: Option<&keyboard::Hotkey> = hotkey.as_ref().into();
@@ -191,10 +192,10 @@ pub fn menu<Message>(menu: Menu<Message>) -> winit::window::Menu {
hotkey.map(|h| self::hotkey(*h)),
);
}
- MenuEntry::Dropdown { content, submenu } => {
+ menu::Entry::Dropdown { content, submenu } => {
converted.add_dropdown(content, self::menu(submenu));
}
- MenuEntry::Separator => converted.add_separator(),
+ menu::Entry::Separator => converted.add_separator(),
}
}