lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-03-20 23:10:37 +01:00
parent b7e0e87e44
commit 2e8fbae89e
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ui/listview.rs
View File

@@ -2,7 +2,7 @@ use std::cmp::{max, min};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use cursive::align::HAlign; use cursive::align::HAlign;
use cursive::event::{Event, EventResult, MouseEvent, MouseButton}; use cursive::event::{Event, EventResult, MouseButton, MouseEvent};
use cursive::theme::ColorStyle; use cursive::theme::ColorStyle;
use cursive::traits::View; use cursive::traits::View;
use cursive::view::ScrollBase; use cursive::view::ScrollBase;
@@ -36,7 +36,7 @@ impl<I: ListItem> ListView<I> {
pub fn with_selected(&self, cb: Box<Fn(&I) -> ()>) { pub fn with_selected(&self, cb: Box<Fn(&I) -> ()>) {
match self.content.read().unwrap().get(self.selected) { match self.content.read().unwrap().get(self.selected) {
Some(x) => cb(x), Some(x) => cb(x),
None => error!("listview: invalid item index: {})", self.selected) None => error!("listview: invalid item index: {})", self.selected),
} }
} }
@@ -112,32 +112,34 @@ impl<I: ListItem> View for ListView<I> {
Event::Mouse { Event::Mouse {
event: MouseEvent::WheelUp, event: MouseEvent::WheelUp,
.. ..
} => { } => self.move_focus(-3),
self.move_focus(-3)
},
Event::Mouse { Event::Mouse {
event: MouseEvent::WheelDown, event: MouseEvent::WheelDown,
.. ..
} => { } => self.move_focus(3),
self.move_focus(3)
},
Event::Mouse { Event::Mouse {
event: MouseEvent::Press(MouseButton::Left), event: MouseEvent::Press(MouseButton::Left),
position, position,
offset offset,
} => if self.scrollbar.scrollable() && } => {
position.y > 0 && position.y <= self.last_size.y && if self.scrollbar.scrollable()
position.checked_sub(offset) && position.y > 0
.map(|p| self.scrollbar.start_drag(p, self.last_size.x)) && position.y <= self.last_size.y
.unwrap_or(false) && position
{}, .checked_sub(offset)
.map(|p| self.scrollbar.start_drag(p, self.last_size.x))
.unwrap_or(false)
{}
}
Event::Mouse { Event::Mouse {
event: MouseEvent::Hold(MouseButton::Left), event: MouseEvent::Hold(MouseButton::Left),
position, position,
offset offset,
} => if self.scrollbar.scrollable() { } => {
self.scrollbar.drag(position.saturating_sub(offset)); if self.scrollbar.scrollable() {
}, self.scrollbar.drag(position.saturating_sub(offset));
}
}
Event::Mouse { Event::Mouse {
event: MouseEvent::Release(MouseButton::Left), event: MouseEvent::Release(MouseButton::Left),
.. ..
@@ -159,8 +161,7 @@ impl<I: ListItem> View for ListView<I> {
fn important_area(&self, view_size: Vec2) -> Rect { fn important_area(&self, view_size: Vec2) -> Rect {
if self.content.read().unwrap().len() > 0 { if self.content.read().unwrap().len() > 0 {
Rect::from((view_size.x, self.selected)) Rect::from((view_size.x, self.selected))
} } else {
else {
Rect::from((0, 0)) Rect::from((0, 0))
} }
} }

4
src/ui/search.rs
View File

@@ -69,7 +69,7 @@ impl SearchView {
fn pass_event_focused(&mut self, event: Event) -> EventResult { fn pass_event_focused(&mut self, event: Event) -> EventResult {
match self.edit_focused { match self.edit_focused {
true => self.edit.on_event(event), true => self.edit.on_event(event),
false => self.list.on_event(event) false => self.list.on_event(event),
} }
} }
} }
@@ -120,7 +120,7 @@ impl View for SearchView {
self.edit_focused = false; self.edit_focused = false;
EventResult::Consumed(None) EventResult::Consumed(None)
} }
_ => self.pass_event_focused(event) _ => self.pass_event_focused(event),
}; };
ret ret