Merge branch 'master' into text-editor
This commit is contained in:
commit
6582387579
109 changed files with 370 additions and 413 deletions
|
|
@ -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) },
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue