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

update: use dyrend & use autosized window in app-list & fix button size in workspaces & only update popup text in time when creating popup

Browse source
This commit is contained in:
Ashley Wulber 2023-01-20 11:25:53 -05:00
parent 9b229c6e72
commit 982b8f5fd1
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
6 changed files with 164 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cosmic-applet-time/src/main.rs
View file

@ -28,6 +28,7 @@ struct Time {
id_ctr: u32,
update_at: Every,
now: DateTime<Local>,
msg: String,
}
impl Default for Time {
@ -39,6 +40,7 @@ impl Default for Time {
id_ctr: 0,
update_at: Every::Minute,
now: Local::now(),
msg: String::new(),
}
}
}
@ -113,6 +115,20 @@ impl Application for Time {
if let Some(p) = self.popup.take() {
destroy_popup(p)
} else {
use std::os::unix::process::ExitStatusExt;
let calendar = std::str::from_utf8(
&std::process::Command::new("happiness")
.output()
.unwrap_or(std::process::Output {
stdout: "`sudo apt install happiness`".as_bytes().to_vec(),
stderr: Vec::new(),
status: std::process::ExitStatus::from_raw(0),
})
.stdout,
)
.unwrap()
.to_string();
self.msg = calendar;
self.id_ctr += 1;
let new_id = window::Id::new(self.id_ctr);
self.popup.replace(new_id);
@ -148,25 +164,11 @@ impl Application for Time {
.width(Length::Units(120))
.into(),
SurfaceIdWrapper::Popup(_) => {
use std::os::unix::process::ExitStatusExt;
let calendar = std::str::from_utf8(
&std::process::Command::new("happiness")
.output()
.unwrap_or(std::process::Output {
stdout: "`sudo apt install happiness`".as_bytes().to_vec(),
stderr: Vec::new(),
status: std::process::ExitStatus::from_raw(0),
})
.stdout,
)
.unwrap()
.to_string();
let content = column![]
.align_items(Alignment::Start)
.spacing(12)
.padding([24, 0])
.push(text(calendar))
.push(text(&self.msg))
.padding(8);
self.applet_helper.popup_container(content).into()