servius/helvum
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/helvum synced 2026-03-15 11:36:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some pedantic clippy warnings

Browse Source
This commit is contained in:
Tom A. Wagner
2021-06-26 12:05:29 +02:00
parent f09fd596c8
commit 7977481689
5 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/view/graph_view.rs
View File

@@ -119,13 +119,13 @@ mod imp {
let mut y = 0.0;
while y < alloc.height.into() {
cr.move_to(0.0, y);
cr.line_to(alloc.width as f64, y);
cr.line_to(alloc.width.into(), y);
y += 20.0; // TODO: Change to em;
}
let mut x = 0.0;
while x < alloc.width as f64 {
while x < alloc.width.into() {
cr.move_to(x, 0.0);
cr.line_to(x, alloc.height as f64);
cr.line_to(x, alloc.height.into());
x += 20.0; // TODO: Change to em;
}
if let Err(e) = cr.stroke() {
@@ -159,7 +159,7 @@ mod imp {
/// Get coordinates for the drawn link to start at and to end at.
///
/// # Returns
/// Some((from_x, from_y, to_x, to_y)) if all objects the links refers to exist as widgets.
/// `Some((from_x, from_y, to_x, to_y))` if all objects the links refers to exist as widgets.
fn get_link_coordinates(&self, link: &crate::PipewireLink) -> Option<(f64, f64, f64, f64)> {
let nodes = self.nodes.borrow();
@@ -194,7 +194,7 @@ mod imp {
tx += tnx;
ty += tny + (th / 2);
Some((fx as f64, fy as f64, tx as f64, ty as f64))
Some((fx.into(), fy.into(), tx.into(), ty.into()))
}
}
}

8
src/view/node.rs
View File

@@ -12,8 +12,8 @@ mod imp {
pub(super) grid: gtk::Grid,
pub(super) label: gtk::Label,
pub(super) ports: RefCell<HashMap<u32, Rc<crate::view::port::Port>>>,
pub(super) num_ports_in: Cell<u32>,
pub(super) num_ports_out: Cell<u32>,
pub(super) num_ports_in: Cell<i32>,
pub(super) num_ports_out: Cell<i32>,
}
#[glib::object_subclass]
@@ -81,13 +81,13 @@ impl Node {
Direction::Input => {
private
.grid
.attach(&port, 0, private.num_ports_in.get() as i32 + 1, 1, 1);
.attach(&port, 0, private.num_ports_in.get() + 1, 1, 1);
private.num_ports_in.set(private.num_ports_in.get() + 1);
}
Direction::Output => {
private
.grid
.attach(&port, 1, private.num_ports_out.get() as i32 + 1, 1, 1);
.attach(&port, 1, private.num_ports_out.get() + 1, 1, 1);
private.num_ports_out.set(private.num_ports_out.get() + 1);
}
}