leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(network): focus password input in authentication dialog

Browse source
This commit is contained in:
Md istekhar 2026-02-18 03:19:16 +05:30 • committed by GitHub
parent eb8784be40
commit 6e74e90ea2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cosmic-applet-network/src/app.rs
View file

@ -34,7 +34,7 @@ use cosmic::{
iced_runtime::core::window,
surface, theme,
widget::{
Column, Row, button, container, divider,
Column, Id, Row, button, container, divider,
icon::{self, from_name},
scrollable, secure_input, text, text_input,
},
@ -99,6 +99,8 @@ impl From<NewConnectionState> for AccessPoint {
static WIFI: LazyLock<id::Toggler> = LazyLock::new(id::Toggler::unique);
static AIRPLANE_MODE: LazyLock<id::Toggler> = LazyLock::new(id::Toggler::unique);
pub static SECURE_INPUT_WIFI: LazyLock<Id> = LazyLock::new(Id::unique);
#[derive(Default, Debug, Clone)]
pub struct MyNetworkState {
pub known_vpns: IndexMap<UUID, ConnectionSettings>,
@ -466,6 +468,8 @@ pub(crate) enum Message {
OpenSettings,
ResetFailedKnownSsid(String, HwAddress),
TogglePasswordVisibility,
FocusSecureInput,
NoOp,
Surface(surface::Action),
ActivateVpn(Arc<str>), // UUID of VPN to activate
DeactivateVpn(Arc<str>), // UUID of VPN to deactivate
@ -893,6 +897,7 @@ impl cosmic::Application for CosmicNetworkApplet {
password: String::new().into(),
password_hidden: true,
});
return cosmic::task::message(cosmic::Action::App(Message::FocusSecureInput));
}
}
Message::ToggleVisibleNetworks => {
@ -907,6 +912,11 @@ impl cosmic::Application for CosmicNetworkApplet {
*password_hidden = !*password_hidden;
}
}
Message::FocusSecureInput => {
return text_input::focus(SECURE_INPUT_WIFI.clone())
.map(|_: ()| cosmic::Action::App(Message::NoOp));
}
Message::NoOp => {}
Message::CancelNewConnection => {
self.new_connection = None;
}
@ -1866,6 +1876,7 @@ impl cosmic::Application for CosmicNetworkApplet {
Some(Message::TogglePasswordVisibility),
*password_hidden,
)
.id(SECURE_INPUT_WIFI.clone())
.on_input(|s| Message::PasswordUpdate(SecureString::from(s)))
.on_paste(|s| Message::PasswordUpdate(SecureString::from(s)))
.on_submit(|_| Message::ConnectWithPassword),

44
cosmic-applet-power/src/lib.rs
View file

@ -147,33 +147,27 @@ impl cosmic::Application for Power {
tracing::error!("Wayland tx is None");
}
}
Message::Action(action) => {
match action {
PowerAction::LogOut => {
if let Err(err) = process::Command::new("cosmic-osd").arg("log-out").spawn()
{
tracing::error!("Failed to spawn cosmic-osd. {err:?}");
return PowerAction::LogOut.perform();
}
Message::Action(action) => match action {
PowerAction::LogOut => {
if let Err(err) = process::Command::new("cosmic-osd").arg("log-out").spawn() {
tracing::error!("Failed to spawn cosmic-osd. {err:?}");
return PowerAction::LogOut.perform();
}
PowerAction::Restart => {
if let Err(err) = process::Command::new("cosmic-osd").arg("restart").spawn()
{
tracing::error!("Failed to spawn cosmic-osd. {err:?}");
return PowerAction::Restart.perform();
}
}
PowerAction::Shutdown => {
if let Err(err) =
process::Command::new("cosmic-osd").arg("shutdown").spawn()
{
tracing::error!("Failed to spawn cosmic-osd. {err:?}");
return PowerAction::Shutdown.perform();
}
}
a => return a.perform(),
}
}
PowerAction::Restart => {
if let Err(err) = process::Command::new("cosmic-osd").arg("restart").spawn() {
tracing::error!("Failed to spawn cosmic-osd. {err:?}");
return PowerAction::Restart.perform();
}
}
PowerAction::Shutdown => {
if let Err(err) = process::Command::new("cosmic-osd").arg("shutdown").spawn() {
tracing::error!("Failed to spawn cosmic-osd. {err:?}");
return PowerAction::Shutdown.perform();
}
}
a => return a.perform(),
},
Message::Zbus(result) => {
if let Err(e) = result {
eprintln!("cosmic-applet-power ERROR: '{e}'");