feat: allow widgets to control the visibility of objects

Author: denisandroid

src/app/tray_menu.rs

@@ -68,19 +68,17 @@ impl AppTrayMenu {
 
 					init(&mut menu_item);
 					menu.append(&*menu_item);
-					menu_item.show();
 				}
 				AppTrayMenuItem::Item { value, mut init } => {
 					let mut menu_item = ViIconMenuItem::new((), value);
 
 					init(&mut menu_item);
 					menu.append(&*menu_item);
-					menu_item.show();
 				}
 				AppTrayMenuItem::Separator => {
 					let separator = gtk::SeparatorMenuItem::new();
 					menu.append(&separator);
-					separator.show();
+					separator.set_visible(true);
 				}
 			}
 		}

src/main.rs

@@ -166,8 +166,7 @@ fn main() -> anyhowResult<ExitCode> {
 
 		let name_window = app_config.get_name_or_default();
 
-		let mut is_keyboard_allowed = false;
-		build_ui(app, name_window, &app_config, &c_display, &defcss, &mut is_keyboard_allowed, tx_appevents.clone(), rx_appevents.clone());
+		build_ui(app, name_window, &app_config, &c_display, &defcss, tx_appevents.clone(), rx_appevents.clone());
 	}));
 
 	Ok(application.run())
@@ -197,7 +196,6 @@ fn build_ui(
 	app_config: &Rc<AppConfig>,
 	c_display: &Rc<ViGraphDisplayInfo>,
 	defcss: &CssProvider,
-	is_keyboard_allowed: &mut bool,
 
 	sender: Sender<AppEvents>,
 	receiver: Rc<Receiver<AppEvents>>,
@@ -229,6 +227,9 @@ fn build_ui(
 		);
 
 	let vbox = Rc::new(GtkBox::new(gtk::Orientation::Vertical, 0));
+	vbox.set_valign(gtk::Align::Start);
+	vbox.set_halign(gtk::Align::Baseline);
+
 	vbox.pack_start(
 		&ViDockHead::new(
 			app_config.clone(),
@@ -241,11 +242,10 @@ fn build_ui(
 		0,
 	); // expand: true, fill: true
 
-	let sensors: LMSensors = 
-		lm_sensors::Initializer::default()
-			.initialize()
-			.map_err(|e| anyhow!("{:?}", e))
-			.unwrap(); // TODO REFACTORING ME?;
+	let sensors: LMSensors = lm_sensors::Initializer::default()
+		.initialize()
+		.map_err(|e| anyhow!("{:?}", e))
+		.unwrap(); // TODO REFACTORING ME?;
 
 	{
 		vbox.pack_start(
@@ -399,6 +399,7 @@ fn build_ui(
 		});
 	}
 	dock_window.set_child(Some(&*vbox));
+	vbox.set_visible(true);
 
 	std::thread::spawn(enc!((sender)move || {
 		let keyboard_listener = KeyboardListenerBuilder::with_len::<6>()
@@ -466,6 +467,7 @@ fn build_ui(
 
 		dock_window.set_pos_inscreen(&*c_display, pos_inscreen);
 	}));
+
 	dock_window.connect_resize_mode_notify(enc!((pos_inscreen, c_display, dock_window) move |_| {
 		let pos_inscreen: PosINScreen = *pos_inscreen.borrow();
 
@@ -496,7 +498,7 @@ fn build_ui(
 		}),
 	);
 	glib::timeout_add_local(
-		std::time::Duration::from_millis(500),
+		std::time::Duration::from_millis(1500),
 		enc!((sender)move || {
 			let _e = sender.send_blocking(AppEvents::KeyboardListenerState(false));
 
@@ -572,9 +574,9 @@ fn build_ui(
 					},
 					AppEvents::KeyboardListenerState(false) => {
 						if let Some(vihotkey) = wdock_vihotkey {
-							vihotkey.hide();
+							vihotkey.set_visible(false);
 							vbox.remove(&vihotkey);
-							
+
 							wdock_vihotkey = None;
 						}
 					},
@@ -584,6 +586,6 @@ fn build_ui(
 	);
 
 	glib::MainContext::default().spawn_local(enc!((dock_window) async move {
-		dock_window.show_all();
+		dock_window.present();
 	}));
 }

src/widgets/dock_head.rs

@@ -44,18 +44,18 @@ impl ViDockHead {
 		let head = Box::new(gtk::Orientation::Horizontal, 0);
 		head.style_context().add_class("namehead");
 		head.set_valign(gtk::Align::Start);
-		
+
 		head.connect_draw(enc!((app_config)move |window, cr| {
 			let head_color = app_config.get_window_app_config().get_head_color();
 
 			if head_color.is_notblack(transparent) {
 					let (r, g, b, a) = head_color.into_rgba(transparent);
 					let (width, height) = {
 						let allocation = window.allocation();
-						
+
 						(allocation.width().into(), allocation.height().into())
 					};
-					
+
 					cr.set_source_rgba(r, g, b, a);
 					cr.rectangle(
 						0.0,
@@ -80,6 +80,7 @@ impl ViDockHead {
 
 			head.pack_start(&version_label, true, true, 0); // expand: true, fill: true
 		});
+		head.set_visible(true);
 
 		Self(head)
 	}

src/widgets/hotkeys.rs

@@ -1,3 +1,5 @@
+use std::ops::Deref;
+
 use crate::__gen_transparent_gtk_type;
 use crate::app::config::FontAppConfig;
 use crate::core::maybe::Maybe;
@@ -68,3 +70,12 @@ impl ViHotkeyItems {
 		Self(all)
 	}
 }
+
+impl Deref for ViHotkeyItems {
+	type Target = Box;
+
+	#[inline]
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}

src/widgets/mod.rs

@@ -76,6 +76,8 @@ impl ViMeter {
 		let graphsender = ViGraph::new_graphsender(app_config.clone(), width, 42, len, transparent);
 		vbox.pack_start(&*graphsender, true, true, 0);
 
+		vbox.set_visible(true);
+
 		ViMeterSender {
 			app_config,
 			color_and_text: textmeter_sender,
@@ -105,14 +107,11 @@ impl ViMeterSender {
 		maybe!((graph_v) {
 			if !self.graph.is_visible() {
 				self.graph.set_visible(true);
-				self.graph.show();
 			}
 			self.graph.push_next(graph_v);
 		}else {
 			if self.graph.is_visible() {
 				self.graph.set_visible(false);
-
-				self.graph.hide();
 			}
 		});
 

src/widgets/primitives/color_block.rs

@@ -33,6 +33,7 @@ impl ViColorBlock {
 		let drawing_area = DrawingArea::new();
 		drawing_area.style_context().add_class("vicolorblock");
 		drawing_area.set_size_request(width, height);
+		drawing_area.set_visible(true);
 
 		Self(drawing_area)
 	}

src/widgets/primitives/graph.rs

@@ -168,6 +168,7 @@ impl Deref for ViGraphSender {
 impl ViGraphSender {
 	pub fn push_next_and_queue_draw(&self, v: f64) {
 		self.push_next(v);
+
 		self.queue_draw();
 	}
 

src/widgets/primitives/hotkeyitem.rs

@@ -41,6 +41,7 @@ impl ViHotkeyItem {
 			.set_margin_top(4)
 			.set_margin_start(3);
 		hbox.pack_start(&label, false, false, 0);
+		hbox.set_visible(true);
 
 		Self(hbox)
 	}

src/widgets/primitives/icon_menuitem.rs

@@ -2,7 +2,7 @@ use crate::maybe;
 use crate::{__gen_transparent_gtk_type, core::maybe::Maybe};
 use gtk::MenuItem;
 use gtk::ffi::GtkMenuItem;
-use gtk::traits::ContainerExt;
+use gtk::traits::{ContainerExt, WidgetExt};
 use std::ops::Deref;
 
 #[repr(transparent)]
@@ -49,6 +49,7 @@ impl ViIconMenuItem {
 		} else {
 			menu_item.set_child(Some(&gtk::Label::new(Some(label))));
 		});
+		menu_item.set_visible(true);
 
 		Self(menu_item)
 	}

src/widgets/primitives/label.rs

@@ -59,6 +59,7 @@ impl ViLabel {
 			style.add_class("vilabel");
 			maybe!((class) style.add_class(class));
 		}
+		label.set_visible(true);
 
 		Self(label)
 	}