me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into text-editor

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-10-27 03:58:45 +02:00
commit 6582387579
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
109 changed files with 370 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

6
style/src/lib.rs
View file

@ -10,16 +10,10 @@
#![forbid(unsafe_code, rust_2018_idioms)]
#![deny(
unused_results,
clippy::extra_unused_lifetimes,
clippy::from_over_into,
clippy::needless_borrow,
clippy::new_without_default,
clippy::useless_conversion,
// missing_docs,
unused_results,
rustdoc::broken_intra_doc_links
)]
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
pub use iced_core as core;
pub mod application;

2
style/src/rule.rs
View file

@ -47,7 +47,7 @@ impl FillMode {
///
/// # Returns
///
/// * (starting_offset, length)
/// * (`starting_offset`, `length`)
pub fn fill(&self, space: f32) -> (f32, f32) {
match *self {
FillMode::Full => (0.0, space),

6
style/src/theme.rs
View file

@ -394,7 +394,7 @@ impl container::StyleSheet for Theme {
fn appearance(&self, style: &Self::Style) -> container::Appearance {
match style {
Container::Transparent => Default::default(),
Container::Transparent => container::Appearance::default(),
Container::Box => {
let palette = self.extended_palette();
@ -905,7 +905,7 @@ impl svg::StyleSheet for Theme {
fn appearance(&self, style: &Self::Style) -> svg::Appearance {
match style {
Svg::Default => Default::default(),
Svg::Default => svg::Appearance::default(),
Svg::Custom(custom) => custom.appearance(self),
}
}
@ -1054,7 +1054,7 @@ impl text::StyleSheet for Theme {
fn appearance(&self, style: Self::Style) -> text::Appearance {
match style {
Text::Default => Default::default(),
Text::Default => text::Appearance::default(),
Text::Color(c) => text::Appearance { color: Some(c) },
}
}