Merge branch 'master' into feature/custom-styling

This commit is contained in:
Héctor Ramón Jiménez 2020-01-05 22:03:32 +01:00
commit bbc8f837d7
20 changed files with 818 additions and 9 deletions

View file

@ -50,7 +50,8 @@ pub fn button_state(element_state: winit::event::ElementState) -> ButtonState {
}
}
/// Convert some `ModifiersState` from [`winit`] to an [`iced_native`] modifiers state.
/// Convert some `ModifiersState` from [`winit`] to an [`iced_native`] modifiers
/// state.
///
/// [`winit`]: https://github.com/rust-windowing/winit
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native

View file

@ -1,5 +1,4 @@
use std::collections::VecDeque;
use std::time;
use std::{collections::VecDeque, time};
#[derive(Debug)]
pub struct Debug {