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

Merge pull request #40 from pop-os/time-to-fix-sytling_jammy

Browse source 
Time to fix sytling
This commit is contained in:
Brock 2022-12-21 17:13:39 -07:00 • committed by GitHub
commit ceff811072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 368 additions and 261 deletions
Download patch file Download diff file Expand all files Collapse all files

604
applets/cosmic-applet-time/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

3
applets/cosmic-applet-time/Cargo.toml
View file

@ -8,8 +8,5 @@ license = "GPL-3.0-or-later"
icon-loader = { version = "0.3.6", features = ["gtk"] } icon-loader = { version = "0.3.6", features = ["gtk"] }
tokio = { version = "1.20.1", features=["full"] } tokio = { version = "1.20.1", features=["full"] }
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet"] } libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet"] }
# libcosmic = { path = "../../../../libcosmic", default-features = false, features = ["wayland", "applet"] }
# iced_sctk = { git = "https://github.com/pop-os/iced-sctk" }
# sctk = { package = "smithay-client-toolkit", git = "https://github.com/Smithay/client-toolkit", commit = "f1d9c3ef9cfbd508d986f7f98b2fc267fcc39b84" }
nix = "0.24.1" nix = "0.24.1"
chrono = { version = "0.4.23", features = ["clock"] } chrono = { version = "0.4.23", features = ["clock"] }

22
applets/cosmic-applet-time/src/main.rs
View file

@ -6,16 +6,18 @@ use cosmic::iced::wayland::{
use cosmic::iced::{ use cosmic::iced::{
executor, time, executor, time,
widget::{button, column, text}, widget::{button, column, text},
window, Alignment, Application, Color, Command, Subscription, window, Alignment, Application, Color, Command, Length, Subscription,
}; };
use cosmic::iced_style::application::{self, Appearance}; use cosmic::iced_style::application::{self, Appearance};
use cosmic::theme;
use cosmic::{Element, Theme}; use cosmic::{Element, Theme};
use chrono::{DateTime, Local, Timelike}; use chrono::{DateTime, Local, Timelike};
use std::time::Duration; use std::time::Duration;
pub fn main() -> cosmic::iced::Result { pub fn main() -> cosmic::iced::Result {
let helper = CosmicAppletHelper::default(); let mut helper = CosmicAppletHelper::default();
helper.window_size(120, 16);
Time::run(helper.window_settings()) Time::run(helper.window_settings())
} }
@ -119,7 +121,7 @@ impl Application for Time {
window::Id::new(0), window::Id::new(0),
new_id, new_id,
(400, 300), (400, 300),
None, Some(60),
None, None,
); );
get_popup(popup_settings) get_popup(popup_settings)
@ -136,11 +138,15 @@ impl Application for Time {
fn view(&self, id: SurfaceIdWrapper) -> Element<Message> { fn view(&self, id: SurfaceIdWrapper) -> Element<Message> {
match id { match id {
SurfaceIdWrapper::LayerSurface(_) => unimplemented!(), SurfaceIdWrapper::LayerSurface(_) => unimplemented!(),
SurfaceIdWrapper::Window(_) => { SurfaceIdWrapper::Window(_) => button(
button(text(self.now.format("%b %-d %-I:%M %p").to_string())) column![text(self.now.format("%b %-d %-I:%M %p").to_string())]
.on_press(Message::TogglePopup) .width(Length::Fill)
.into() .align_items(Alignment::Center),
} )
.on_press(Message::TogglePopup)
.style(theme::Button::Text)
.width(Length::Units(120))
.into(),
SurfaceIdWrapper::Popup(_) => { SurfaceIdWrapper::Popup(_) => {
use std::os::unix::process::ExitStatusExt; use std::os::unix::process::ExitStatusExt;
let calendar = std::str::from_utf8( let calendar = std::str::from_utf8(