leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy warnings

Browse source
This commit is contained in:
Edgar Geier 2023-02-28 19:42:53 +01:00
parent 2b991129e3
commit 6c501c6640
No known key found for this signature in database
GPG key ID: 7A65B51FD6B75EF5
9 changed files with 80 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
examples/editor-libcosmic/src/main.rs
View file

@ -74,7 +74,7 @@ impl fmt::Display for FontSize {
}
}
static WRAP_MODE: &'static [Wrap] = &[Wrap::None, Wrap::Glyph, Wrap::Word];
static WRAP_MODE: &[Wrap] = &[Wrap::None, Wrap::Glyph, Wrap::Word];
fn main() -> cosmic::iced::Result {
env_logger::init();
@ -274,7 +274,7 @@ impl Application for Window {
}
fn view(&self) -> Element<Message> {
static THEMES: &'static [&'static str] = &["Dark", "Light"];
static THEMES: &[&str] = &["Dark", "Light"];
let theme_picker = pick_list(
THEMES,
Some(match self.theme {
@ -375,11 +375,11 @@ fn update_alignment<'a, T: Edit<'a>>(editor: &mut T, align: Align) {
std::cmp::Ordering::Less => (select.line, current_line),
std::cmp::Ordering::Equal => (current_line, current_line),
};
editor.buffer_mut().lines.get_mut(start..=end).map(|lines| {
if let Some(lines) = editor.buffer_mut().lines.get_mut(start..=end) {
for line in lines.iter_mut() {
line.set_align(Some(align));
}
});
}
} else if let Some(line) = editor.buffer_mut().lines.get_mut(current_line) {
line.set_align(Some(align));
}

4
examples/editor-libcosmic/src/text.rs
View file

@ -227,7 +227,7 @@ pub fn draw_pixel(
let mut current = buffer[offset + 2] as u32
| (buffer[offset + 1] as u32) << 8
| (buffer[offset + 0] as u32) << 16
| (buffer[offset] as u32) << 16
| (buffer[offset + 3] as u32) << 24;
if alpha >= 255 || current == 0 {
@ -244,7 +244,7 @@ pub fn draw_pixel(
buffer[offset + 2] = current as u8;
buffer[offset + 1] = (current >> 8) as u8;
buffer[offset + 0] = (current >> 16) as u8;
buffer[offset] = (current >> 16) as u8;
buffer[offset + 3] = (current >> 24) as u8;
}

26
examples/editor-libcosmic/src/text_box.rs
View file

@ -62,7 +62,7 @@ impl<'a, Editor> TextBox<'a, Editor> {
}
}
pub fn text_box<'a, Editor>(editor: &'a Mutex<Editor>) -> TextBox<'a, Editor> {
pub fn text_box<Editor>(editor: &Mutex<Editor>) -> TextBox<Editor> {
TextBox::new(editor)
}
@ -174,7 +174,7 @@ where
&mut state.cache.lock().unwrap(),
text_color,
|x, y, w, h, color| {
if w <= 0 || h <= 0 {
if w == 0 || h == 0 {
// Do not draw invalid sized rectangles
return;
}
@ -235,10 +235,7 @@ where
let mut status = Status::Ignored;
match event {
Event::Keyboard(KeyEvent::KeyPressed {
key_code,
modifiers,
}) => match key_code {
Event::Keyboard(KeyEvent::KeyPressed { key_code, .. }) => match key_code {
KeyCode::Left => {
editor.action(Action::Left);
status = Status::Captured;
@ -318,15 +315,14 @@ where
status = Status::Captured;
}
}
Event::Mouse(MouseEvent::WheelScrolled { delta }) => match delta {
ScrollDelta::Lines { x, y } => {
editor.action(Action::Scroll {
lines: (-y * 6.0) as i32,
});
status = Status::Captured;
}
_ => (),
},
Event::Mouse(MouseEvent::WheelScrolled {
delta: ScrollDelta::Lines { y, .. },
}) => {
editor.action(Action::Scroll {
lines: (-y * 6.0) as i32,
});
status = Status::Captured;
}
_ => (),
}