clippy fix
This commit is contained in:
parent
00dc33a661
commit
4a2f41eaf3
5 changed files with 52 additions and 64 deletions
|
@ -1,5 +1,3 @@
|
|||
use std::rc::Rc;
|
||||
|
||||
use cosmic::{
|
||||
iced::{
|
||||
alignment::Vertical, clipboard::dnd::DndAction,
|
||||
|
@ -394,7 +392,7 @@ impl<'a> Library {
|
|||
)
|
||||
.action(DndAction::Copy)
|
||||
.drag_icon({
|
||||
let model = model.kind.clone();
|
||||
let model = model.kind;
|
||||
move |i| {
|
||||
let state = State::None;
|
||||
let icon = match model {
|
||||
|
|
|
@ -9,20 +9,17 @@ use cosmic::{
|
|||
Background, Border, Color, ContentFit, Font, Length, Shadow,
|
||||
Vector,
|
||||
},
|
||||
iced_core::text::Span,
|
||||
iced_widget::{
|
||||
rich_text,
|
||||
scrollable::{
|
||||
scroll_to, AbsoluteOffset, Direction, Scrollbar,
|
||||
},
|
||||
span, stack,
|
||||
text::Rich,
|
||||
vertical_rule,
|
||||
span, stack, vertical_rule,
|
||||
},
|
||||
prelude::*,
|
||||
widget::{
|
||||
container, horizontal_space, image, mouse_area, responsive,
|
||||
scrollable, text, Column, Container, Id, Row, Space,
|
||||
container, image, mouse_area, responsive, scrollable, text,
|
||||
Column, Container, Id, Row, Space,
|
||||
},
|
||||
Task,
|
||||
};
|
||||
|
@ -32,11 +29,7 @@ use tracing::{debug, error, info, warn};
|
|||
use url::Url;
|
||||
|
||||
use crate::{
|
||||
core::{
|
||||
service_items::{Service, ServiceItem},
|
||||
slide::Slide,
|
||||
},
|
||||
ui::text_svg::{self, Font as SvgFont},
|
||||
core::{service_items::ServiceItem, slide::Slide},
|
||||
// ui::widgets::slide_text,
|
||||
BackgroundKind,
|
||||
};
|
||||
|
|
|
@ -7,12 +7,11 @@ use cosmic::{
|
|||
Font, Length,
|
||||
},
|
||||
iced_wgpu::graphics::text::cosmic_text::fontdb,
|
||||
iced_widget::{row, stack},
|
||||
iced_widget::row,
|
||||
theme,
|
||||
widget::{
|
||||
button, column, combo_box, container, dropdown,
|
||||
horizontal_space, icon, scrollable, svg::Handle, text,
|
||||
text_editor, text_input, Svg,
|
||||
button, column, combo_box, container, horizontal_space, icon,
|
||||
scrollable, text, text_editor, text_input,
|
||||
},
|
||||
Element, Task,
|
||||
};
|
||||
|
@ -179,11 +178,11 @@ impl SongEditor {
|
|||
.filter(|f| f.1 == font)
|
||||
.map(|f| f.0)
|
||||
.next();
|
||||
if let Some(id) = font_id {
|
||||
if let Some(face) = self.font_db.face(id) {
|
||||
self.font = face.post_script_name.clone();
|
||||
// self.current_font = Font::from(face);
|
||||
}
|
||||
if let Some(id) = font_id
|
||||
&& let Some(face) = self.font_db.face(id)
|
||||
{
|
||||
self.font = face.post_script_name.clone();
|
||||
// self.current_font = Font::from(face);
|
||||
}
|
||||
self.font = font.clone();
|
||||
|
||||
|
@ -425,16 +424,16 @@ order",
|
|||
}
|
||||
|
||||
fn background_video(&mut self, background: &Option<Background>) {
|
||||
if let Some(background) = background {
|
||||
if background.kind == BackgroundKind::Video {
|
||||
let video =
|
||||
Video::try_from(background).ok().map(|mut v| {
|
||||
v.set_looping(true);
|
||||
v
|
||||
});
|
||||
debug!(?video);
|
||||
self.video = video;
|
||||
}
|
||||
if let Some(background) = background
|
||||
&& background.kind == BackgroundKind::Video
|
||||
{
|
||||
let video =
|
||||
Video::try_from(background).ok().map(|mut v| {
|
||||
v.set_looping(true);
|
||||
v
|
||||
});
|
||||
debug!(?video);
|
||||
self.video = video;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ use cosmic::{
|
|||
Length, Size,
|
||||
},
|
||||
prelude::*,
|
||||
widget::{container, lazy, responsive, svg::Handle, Svg},
|
||||
widget::{container, svg::Handle, Svg},
|
||||
};
|
||||
use tracing::error;
|
||||
|
||||
|
@ -330,7 +330,7 @@ mod test {
|
|||
|
||||
#[test]
|
||||
fn test_text_spans() {
|
||||
let mut text = TextSvg::new();
|
||||
let mut text = TextSvg::new("yes");
|
||||
text.text = "This is
|
||||
multiline
|
||||
text."
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue