Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts: # winit/src/window.rs
This commit is contained in:
commit
744cef5608
70 changed files with 807 additions and 542 deletions
|
|
@ -28,8 +28,8 @@ pub struct Settings<Flags> {
|
|||
|
||||
/// The text size that will be used by default.
|
||||
///
|
||||
/// The default value is 20.
|
||||
pub default_text_size: u16,
|
||||
/// The default value is `20.0`.
|
||||
pub default_text_size: f32,
|
||||
|
||||
/// If enabled, spread text workload in multiple threads when multiple cores
|
||||
/// are available.
|
||||
|
|
@ -97,7 +97,7 @@ where
|
|||
window: Default::default(),
|
||||
flags: Default::default(),
|
||||
default_font: Default::default(),
|
||||
default_text_size: 20,
|
||||
default_text_size: 20.0,
|
||||
text_multithreading: false,
|
||||
antialiasing: false,
|
||||
exit_on_close_request: true,
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ pub mod button {
|
|||
|
||||
pub mod checkbox {
|
||||
//! Show toggle controls using checkboxes.
|
||||
pub use iced_native::widget::checkbox::{Appearance, StyleSheet};
|
||||
pub use iced_native::widget::checkbox::{Appearance, Icon, StyleSheet};
|
||||
|
||||
/// A box that can be checked.
|
||||
pub type Checkbox<'a, Message, Renderer = crate::Renderer> =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue