diff --git a/applets/cosmic-applet-network/src/main.rs b/applets/cosmic-applet-network/src/main.rs index d48798dd..90c9796e 100644 --- a/applets/cosmic-applet-network/src/main.rs +++ b/applets/cosmic-applet-network/src/main.rs @@ -43,8 +43,10 @@ fn build_ui(application: >k4::Application) { ui::toggles::add_toggles(&main_box); main_box.append(&Separator::new(Orientation::Horizontal)); ui::current_networks::add_current_networks(&main_box); - main_box.append(&Separator::new(Orientation::Horizontal)); - ui::available_wifi::add_available_wifi(&main_box); + let available_wifi_separator = Separator::new(Orientation::Horizontal); + main_box.append(&available_wifi_separator); + available_wifi_separator.hide(); + ui::available_wifi::add_available_wifi(&main_box, available_wifi_separator); window.set_child(Some(&main_box)); window.show(); diff --git a/applets/cosmic-applet-network/src/ui/available_wifi.rs b/applets/cosmic-applet-network/src/ui/available_wifi.rs index f880b67e..f7b75ab5 100644 --- a/applets/cosmic-applet-network/src/ui/available_wifi.rs +++ b/applets/cosmic-applet-network/src/ui/available_wifi.rs @@ -9,12 +9,12 @@ use futures_util::StreamExt; use gtk4::{ glib::{self, clone, source::PRIORITY_DEFAULT, MainContext, Sender}, prelude::*, - Align, Image, + Align, Image, Separator, }; use std::{cell::RefCell, rc::Rc}; use zbus::Connection; -pub fn add_available_wifi(target: >k4::Box) { +pub fn add_available_wifi(target: >k4::Box, separator: Separator) { let ap_entries = Rc::>>::default(); let (tx, rx) = MainContext::channel::>(PRIORITY_DEFAULT); task::spawn(async move { @@ -24,8 +24,9 @@ pub fn add_available_wifi(target: >k4::Box) { }); rx.attach( None, - clone!(@strong ap_entries, @weak target => @default-return Continue(true), move |aps| { + clone!(@strong ap_entries, @weak target, @weak separator, => @default-return Continue(true), move |aps| { build_aps_list(ap_entries.clone(), target, dbg!(aps)); + separator.set_visible(!ap_entries.borrow().is_empty()); Continue(true) }), );