From 66253fe9007e08d96429f6d8f363ea3692105e94 Mon Sep 17 00:00:00 2001 From: alemi Date: Tue, 14 Jun 2022 02:11:40 +0200 Subject: [PATCH] feat: made side panel resizable also renamed some stuff and moved some settings around --- src/app/gui/panel.rs | 23 ++++++++-------- src/app/gui/source.rs | 47 ++++++++++++++++++-------------- src/app/mod.rs | 63 ++++++++++++++++++++++++------------------- 3 files changed, 75 insertions(+), 58 deletions(-) diff --git a/src/app/gui/panel.rs b/src/app/gui/panel.rs index 9567ff3..a133895 100644 --- a/src/app/gui/panel.rs +++ b/src/app/gui/panel.rs @@ -1,8 +1,8 @@ use chrono::{Local, Utc}; -use eframe::egui::{ +use eframe::{egui::{ plot::{Corner, GridMark, Legend, Line, Plot}, - DragValue, Layout, Slider, Ui, -}; + DragValue, Layout, Ui, Slider, TextEdit, +}, emath::Vec2}; use crate::app::{ data::source::{Panel, Source}, @@ -10,13 +10,13 @@ use crate::app::{ }; pub fn panel_edit_inline_ui(ui: &mut Ui, panel: &mut Panel) { - eframe::egui::TextEdit::singleline(&mut panel.name) + TextEdit::singleline(&mut panel.name) .hint_text("name") .desired_width(50.0) .show(ui); } -pub fn panel_title_ui(ui: &mut Ui, panel: &mut Panel) { +pub fn panel_title_ui(ui: &mut Ui, panel: &mut Panel, extra: bool) { ui.horizontal(|ui| { ui.heading(panel.name.as_str()); ui.with_layout(Layout::right_to_left(), |ui| { @@ -30,11 +30,12 @@ pub fn panel_title_ui(ui: &mut Ui, panel: &mut Panel) { .clamp_range(0..=2147483647i32), ); ui.checkbox(&mut panel.limit, "limit"); - ui.separator(); - ui.checkbox(&mut panel.timeserie, "timeserie"); - ui.separator(); - ui.add(Slider::new(&mut panel.height, 0..=500).text("height")); - ui.separator(); + if extra { + ui.separator(); + ui.checkbox(&mut panel.timeserie, "timeserie"); + ui.separator(); + ui.add(Slider::new(&mut panel.height, 0..=500).text("height")); + } }); }); }); @@ -50,7 +51,7 @@ pub fn panel_body_ui(ui: &mut Ui, panel: &mut Panel, sources: &Vec) { p = p.include_x(Utc::now().timestamp() as f64); if panel.limit { p = p - .set_margin_fraction(eframe::emath::Vec2 { x: 0.0, y: 0.1 }) + .set_margin_fraction(Vec2 { x: 0.0, y: 0.1 }) .include_x((Utc::now().timestamp() + (panel.view_size as i64 * 3)) as f64); } if panel.limit { diff --git a/src/app/gui/source.rs b/src/app/gui/source.rs index 724449a..802925c 100644 --- a/src/app/gui/source.rs +++ b/src/app/gui/source.rs @@ -1,26 +1,25 @@ -use eframe::egui; -use eframe::egui::Ui; +use eframe::egui::{Ui, TextEdit, ComboBox, Slider, DragValue}; use crate::app::data::source::{Panel, Source}; pub fn source_edit_inline_ui(ui: &mut Ui, source: &mut Source, panels: &Vec) { - eframe::egui::TextEdit::singleline(&mut source.name) + TextEdit::singleline(&mut source.name) .hint_text("name") .desired_width(50.0) .show(ui); - eframe::egui::TextEdit::singleline(&mut source.url) + TextEdit::singleline(&mut source.url) .hint_text("url") .desired_width(160.0) .show(ui); - eframe::egui::TextEdit::singleline(&mut source.query_x) + TextEdit::singleline(&mut source.query_x) .hint_text("x") .desired_width(30.0) .show(ui); - eframe::egui::TextEdit::singleline(&mut source.query_y) + TextEdit::singleline(&mut source.query_y) .hint_text("y") .desired_width(30.0) .show(ui); - egui::ComboBox::from_id_source("panel") + ComboBox::from_id_source("panel") .selected_text(format!("panel [{}]", source.panel_id)) .width(70.0) .show_ui(ui, |ui| { @@ -29,36 +28,44 @@ pub fn source_edit_inline_ui(ui: &mut Ui, source: &mut Source, panels: &Vec) { +pub fn source_edit_ui(ui: &mut Ui, source: &mut Source, panels: &Vec, width: f32) { ui.group(|ui| { ui.horizontal(|ui| { + let text_width = width - 25.0; ui.checkbox(&mut source.visible, ""); - eframe::egui::TextEdit::singleline(&mut source.name) + TextEdit::singleline(&mut source.name) + .desired_width(text_width / 4.0) .hint_text("name") - .desired_width(80.0) .show(ui); - eframe::egui::TextEdit::singleline(&mut source.url) + TextEdit::singleline(&mut source.url) + .desired_width(text_width * 3.0 / 4.0) .hint_text("url") - .desired_width(300.0) .show(ui); }); ui.horizontal(|ui| { - ui.add(egui::Slider::new(&mut source.interval, 1..=60)); - eframe::egui::TextEdit::singleline(&mut source.query_x) + let text_width : f32 ; + if width > 400.0 { + ui.add(Slider::new(&mut source.interval, 1..=60)); + text_width = width - 330.0 + } else { + ui.add(DragValue::new(&mut source.interval).clamp_range(1..=60)); + text_width = width - 220.0 + } + TextEdit::singleline(&mut source.query_x) + .desired_width(text_width / 2.0) .hint_text("x") - .desired_width(50.0) .show(ui); - eframe::egui::TextEdit::singleline(&mut source.query_y) + TextEdit::singleline(&mut source.query_y) + .desired_width(text_width / 2.0) .hint_text("y") - .desired_width(50.0) .show(ui); - egui::ComboBox::from_id_source(format!("panel-{}", source.id)) + ComboBox::from_id_source(format!("panel-{}", source.id)) + .width(60.0) .selected_text(format!("panel [{}]", source.panel_id)) - .width(70.0) .show_ui(ui, |ui| { for p in panels { ui.selectable_value(&mut source.panel_id, p.id, p.name.as_str()); diff --git a/src/app/mod.rs b/src/app/mod.rs index 57f632a..5612e85 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -3,14 +3,18 @@ pub mod gui; pub mod util; pub mod worker; -use eframe::egui; +use eframe::egui::{ + global_dark_light_mode_switch, CentralPanel, Context, Layout, ScrollArea, SidePanel, + TopBottomPanel, collapsing_header::CollapsingState, +}; +use eframe::emath::Align; use std::sync::Arc; use tracing::error; use self::data::source::{Panel, Source}; use self::data::ApplicationState; use self::gui::panel::{panel_body_ui, panel_edit_inline_ui, panel_title_ui}; -use self::gui::source::{source_edit_inline_ui, source_ui}; +use self::gui::source::{source_edit_inline_ui, source_edit_ui}; use self::util::human_size; use self::worker::native_save; @@ -33,10 +37,10 @@ impl App { } impl eframe::App for App { - fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) { - egui::TopBottomPanel::top("heading").show(ctx, |ui| { + fn update(&mut self, ctx: &Context, frame: &mut eframe::Frame) { + TopBottomPanel::top("heading").show(ctx, |ui| { ui.horizontal(|ui| { - egui::widgets::global_dark_light_mode_switch(ui); + global_dark_light_mode_switch(ui); ui.heading("dashboard"); ui.separator(); ui.checkbox(&mut self.edit, "edit"); @@ -67,7 +71,7 @@ impl eframe::App for App { } ui.separator(); } - ui.with_layout(egui::Layout::top_down(egui::Align::RIGHT), |ui| { + ui.with_layout(Layout::top_down(Align::RIGHT), |ui| { ui.horizontal(|ui| { if ui.small_button("×").clicked() { frame.quit(); @@ -76,8 +80,8 @@ impl eframe::App for App { }); }); }); - egui::TopBottomPanel::bottom("footer").show(ctx, |ui| { - egui::collapsing_header::CollapsingState::load_with_default_open( + TopBottomPanel::bottom("footer").show(ctx, |ui| { + CollapsingState::load_with_default_open( ctx, ui.make_persistent_id("footer-logs"), false, @@ -93,7 +97,7 @@ impl eframe::App for App { .read() .expect("Filesize RwLock poisoned"), )); - ui.with_layout(egui::Layout::top_down(egui::Align::RIGHT), |ui| { + ui.with_layout(Layout::top_down(Align::RIGHT), |ui| { ui.horizontal(|ui| { ui.label(format!( "v{}-{}", @@ -109,7 +113,7 @@ impl eframe::App for App { }) .body(|ui| { ui.set_height(200.0); - egui::ScrollArea::vertical().show(ui, |ui| { + ScrollArea::vertical().show(ui, |ui| { let msgs = self .data .diagnostics @@ -122,24 +126,28 @@ impl eframe::App for App { }); }); if self.edit { - egui::SidePanel::left("sources-bar").show(ctx, |ui| { - let mut sources = self.data.sources.write().expect("Sources RwLock poisoned"); - let panels = self.data.panels.read().expect("Panels RwLock poisoned"); - egui::ScrollArea::vertical().show(ui, |ui| { - for source in &mut *sources { - source_ui(ui, source, &panels); - } - // TODO make this not necessary - ui.collapsing("extra space", |ui| { - ui.add_space(300.0); - ui.separator(); - }) + SidePanel::left("sources-bar") + .width_range(240.0..=800.0) + .default_width(500.0) + .show(ctx, |ui| { + let mut sources = self.data.sources.write().expect("Sources RwLock poisoned"); + let panels = self.data.panels.read().expect("Panels RwLock poisoned"); + ScrollArea::vertical().show(ui, |ui| { + let width = ui.available_width(); + for source in &mut *sources { + source_edit_ui(ui, source, &panels, width); + } + // TODO make this not necessary + ui.collapsing("extra space", |ui| { + ui.add_space(300.0); + ui.separator(); + }) + }); }); - }); } let mut to_swap: Vec = Vec::new(); - egui::CentralPanel::default().show(ctx, |ui| { - egui::ScrollArea::vertical().show(ui, |ui| { + CentralPanel::default().show(ctx, |ui| { + ScrollArea::vertical().show(ui, |ui| { let mut panels = self.data.panels.write().expect("Panels RwLock poisoned"); // TODO only lock as write when editing let panels_count = panels.len(); let sources = self.data.sources.read().expect("Sources RwLock poisoned"); // TODO only lock as write when editing @@ -147,7 +155,7 @@ impl eframe::App for App { if index > 0 { ui.separator(); } - egui::collapsing_header::CollapsingState::load_with_default_open( + CollapsingState::load_with_default_open( ctx, ui.make_persistent_id(format!("panel-{}-compressable", panel.id)), true, @@ -164,8 +172,9 @@ impl eframe::App for App { to_swap.push(index + 1); // TODO kinda jank but is there a better way? } } + ui.separator(); } - panel_title_ui(ui, panel); + panel_title_ui(ui, panel, self.edit); }) .body(|ui| panel_body_ui(ui, panel, &sources)); }