diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/statetracker/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/statetracker/src/main.rs | 21 | ||||
| -rw-r--r-- | examples/statetracker/src/widgets/bufferview.rs | 19 |
3 files changed, 34 insertions, 8 deletions
diff --git a/examples/statetracker/Cargo.toml b/examples/statetracker/Cargo.toml index 8290032..fd86a7c 100644 --- a/examples/statetracker/Cargo.toml +++ b/examples/statetracker/Cargo.toml @@ -11,7 +11,7 @@ druid = { git = "https://github.com/linebender/druid", features = ["im"] } anyhow = "*" tracing = "0.1" -tracing-subscriber = "0.2" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-futures = "0.2" byteorder = "1" diff --git a/examples/statetracker/src/main.rs b/examples/statetracker/src/main.rs index a56d054..ef4a2b3 100644 --- a/examples/statetracker/src/main.rs +++ b/examples/statetracker/src/main.rs @@ -14,6 +14,7 @@ use libquassel::message::{ }; use tracing::debug; +use tracing_subscriber::prelude::*; use crate::server::{Direction, Message, ServerWidget}; @@ -202,7 +203,24 @@ pub struct Syncer { } fn main() { - // pretty_env_logger::init(); + // tracing_subscriber::fmt::fmt() + // .with_span_events(tracing_subscriber::fmt::format::FmtSpan::ACTIVE) + // .init(); + + let filter = tracing_subscriber::filter::Targets::new() + .with_default(tracing::Level::TRACE) + .with_target("druid", tracing::metadata::LevelFilter::OFF); + + let env_filter = tracing_subscriber::EnvFilter::from_default_env(); + + tracing_subscriber::registry() + .with( + tracing_subscriber::fmt::layer() + .with_span_events(tracing_subscriber::fmt::format::FmtSpan::ACTIVE), + ) + .with(filter) + .with(env_filter) + .init(); // describe the main window let main_window = WindowDesc::new(StateTracker::widget()) @@ -214,7 +232,6 @@ fn main() { // start the application AppLauncher::with_window(main_window) - .log_to_console() .delegate(StateTrackerDelegate) .launch(initial_state) .expect("Failed to launch application"); diff --git a/examples/statetracker/src/widgets/bufferview.rs b/examples/statetracker/src/widgets/bufferview.rs index c96f8d5..e5384e2 100644 --- a/examples/statetracker/src/widgets/bufferview.rs +++ b/examples/statetracker/src/widgets/bufferview.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use druid::widget::{Align, Label}; +use druid::widget::{Label}; use druid::{lens, Lens, Point, WidgetPod}; use druid::{widget::Flex, Widget}; @@ -48,8 +48,10 @@ impl Widget<Arc<BufferViewManager>> for BufferViewWidget { ) { let buffer_view_configs = lens!(BufferViewManager, buffer_view_configs); - let mut names: Flex<Arc<BufferViewManager>> = Flex::column(); - let mut buffers: Flex<Arc<BufferViewManager>> = Flex::column(); + let mut names: Flex<Arc<BufferViewManager>> = Flex::row(); + let mut buffers: Flex<Arc<BufferViewManager>> = Flex::row(); + let mut removed_buffers: Flex<Arc<BufferViewManager>> = Flex::row(); + let mut temporarily_removed_buffers: Flex<Arc<BufferViewManager>> = Flex::row(); // let mut expansions: Flex<Arc<BufferViewManager>> = Flex::column(); // TODO optimise this whole thing @@ -57,13 +59,20 @@ impl Widget<Arc<BufferViewManager>> for BufferViewWidget { for (_id, config) in configs { names.add_child(Label::new(config.buffer_view_name.clone())); buffers.add_child(Label::new(format!("{:?}", config.buffers))); + removed_buffers.add_child(Label::new(format!("{:?}", config.removed_buffers))); + temporarily_removed_buffers.add_child(Label::new(format!( + "{:?}", + config.temporarily_removed_buffers + ))); // expansions.add_child(Align::left(Label::new(alias.expansion.clone()))); } }); - let widget: Flex<Arc<BufferViewManager>> = Flex::row() + let widget: Flex<Arc<BufferViewManager>> = Flex::column() .with_flex_child(names, 1.0) - .with_flex_child(buffers, 1.0); + .with_flex_child(buffers, 1.0) + .with_flex_child(removed_buffers, 1.0) + .with_flex_child(temporarily_removed_buffers, 1.0); // .with_flex_child(expansions, 1.0); self.inner = WidgetPod::new(widget).boxed(); |