diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-24 19:08:21 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-24 19:08:21 +0100 |
| commit | e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006 (patch) | |
| tree | 78608f77c6db3ff1e61a58008bd54d114f32352c /src | |
| parent | 7cb1452d29ddfdcd29fd7ecc7c96a79ea2681fce (diff) | |
| parent | fd7d9622e333a0a2cd5c2e8e6cc38cc09d7981e4 (diff) | |
| download | iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.tar.gz iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.tar.bz2 iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.zip | |
Merge branch 'master' into feature/text-selection
Diffstat (limited to 'src')
| -rw-r--r-- | src/application.rs | 1 | ||||
| -rw-r--r-- | src/keyboard.rs | 6 | ||||
| -rw-r--r-- | src/lib.rs | 1 | ||||
| -rw-r--r-- | src/widget.rs | 5 |
4 files changed, 11 insertions, 2 deletions
diff --git a/src/application.rs b/src/application.rs index 374810cb..2ee3337f 100644 --- a/src/application.rs +++ b/src/application.rs @@ -183,6 +183,7 @@ pub trait Application: Sized { } else { None }, + ..iced_wgpu::Settings::default() }, ); diff --git a/src/keyboard.rs b/src/keyboard.rs new file mode 100644 index 00000000..181dd974 --- /dev/null +++ b/src/keyboard.rs @@ -0,0 +1,6 @@ +//! Listen and react to keyboard events. +#[cfg(not(target_arch = "wasm32"))] +pub use iced_winit::input::keyboard::{KeyCode, ModifiersState}; + +#[cfg(target_arch = "wasm32")] +pub use iced_web::keyboard::{KeyCode, ModifiersState}; @@ -183,6 +183,7 @@ mod element; mod sandbox; pub mod executor; +pub mod keyboard; pub mod settings; pub mod widget; pub mod window; diff --git a/src/widget.rs b/src/widget.rs index 7d3a1cef..91ea1ed4 100644 --- a/src/widget.rs +++ b/src/widget.rs @@ -35,8 +35,9 @@ mod platform { #[doc(no_inline)] pub use { button::Button, checkbox::Checkbox, container::Container, image::Image, - progress_bar::ProgressBar, radio::Radio, scrollable::Scrollable, - slider::Slider, svg::Svg, text_input::TextInput, + pane_grid::PaneGrid, progress_bar::ProgressBar, radio::Radio, + scrollable::Scrollable, slider::Slider, svg::Svg, + text_input::TextInput, }; /// A container that distributes its contents vertically. |