From 3b54c2f8bdd040f08c624a9f2ec2d93dca2c9a5a Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 14 Dec 2021 14:20:05 -0500 Subject: [PATCH] ui improvement --- veilid-cli/src/ui.rs | 20 +++++-------------- .../src/intf/native/network/protocol/udp.rs | 4 ++-- veilid-core/src/rpc_processor/mod.rs | 5 +++-- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/veilid-cli/src/ui.rs b/veilid-cli/src/ui.rs index 35efe66a..87368235 100644 --- a/veilid-cli/src/ui.rs +++ b/veilid-cli/src/ui.rs @@ -200,21 +200,6 @@ impl UI { }); } - // fn main_layout(s: &mut Cursive) -> ViewRef { - // s.find_name("main-layout").unwrap() - // } - // fn column_layout(s: &mut Cursive) -> ViewRef { - // s.find_name("column-layout").unwrap() - // } - // fn button_layout(s: &mut Cursive) -> ViewRef { - // s.find_name("button-layout").unwrap() - // } - // fn peers(s: &mut Cursive) -> ViewRef { - // s.find_name("peers").unwrap() - // } - // fn node_events(s: &mut Cursive) -> ViewRef { - // s.find_name("node-events").unwrap() - // } fn command_line(s: &mut Cursive) -> ViewRef { s.find_name("command-line").unwrap() } @@ -482,10 +467,15 @@ impl UI { inner.connection_dialog_state = Some(state); drop(inner); if hide { + s.pop_layer(); s.pop_layer(); return true; } if show { + s.add_fullscreen_layer(Layer::with_color( + ResizedView::with_full_screen(DummyView {}), + ColorStyle::new(PaletteColor::Background, PaletteColor::Background), + )); s.add_layer( Dialog::around( LinearLayout::vertical().child( diff --git a/veilid-core/src/intf/native/network/protocol/udp.rs b/veilid-core/src/intf/native/network/protocol/udp.rs index 9d575d12..c0db1ef4 100644 --- a/veilid-core/src/intf/native/network/protocol/udp.rs +++ b/veilid-core/src/intf/native/network/protocol/udp.rs @@ -36,7 +36,7 @@ impl RawUdpProtocolHandler { } trace!( - "receiving message of length {} from {}", + "receiving UDP message of length {} from {}", data.len(), remote_addr ); @@ -67,7 +67,7 @@ impl RawUdpProtocolHandler { } trace!( - "sending message of length {} to {}", + "sending UDP message of length {} to {}", data.len(), socket_addr ); diff --git a/veilid-core/src/rpc_processor/mod.rs b/veilid-core/src/rpc_processor/mod.rs index cbf8c89a..b845c4ea 100644 --- a/veilid-core/src/rpc_processor/mod.rs +++ b/veilid-core/src/rpc_processor/mod.rs @@ -89,13 +89,13 @@ macro_rules! map_error_panic { }; } -#[derive(Clone)] +#[derive(Debug, Clone)] pub enum Destination { Direct(NodeRef), PrivateRoute(PrivateRoute), } -#[derive(Clone)] +#[derive(Debug, Clone)] pub enum RespondTo { None, Sender, @@ -320,6 +320,7 @@ impl RPCProcessor { if nr.node_id() != node_id { // found a close node, but not exact within our configured resolve_node timeout + error!("XXX: Timeout"); return Err(RPCError::Timeout); }