chore: udpate libcosmic
This commit is contained in:
parent
61d1d1b91d
commit
c54ddeb38a
17 changed files with 139 additions and 426 deletions
|
|
@ -5,7 +5,6 @@ use std::str::FromStr;
|
|||
|
||||
use chrono::{Datelike, Timelike};
|
||||
use cosmic::iced_futures::stream;
|
||||
use cosmic::surface_message::{MessageWrapper, SurfaceMessage};
|
||||
use cosmic::widget::Id;
|
||||
use cosmic::{
|
||||
app,
|
||||
|
|
@ -19,7 +18,7 @@ use cosmic::{
|
|||
window, Alignment, Length, Rectangle, Subscription,
|
||||
},
|
||||
iced_widget::{horizontal_rule, Column},
|
||||
theme,
|
||||
surface, theme,
|
||||
widget::{
|
||||
autosize, button, container, divider, grid, horizontal_space, icon, rectangle_tracker::*,
|
||||
text, Button, Grid, Space,
|
||||
|
|
@ -80,22 +79,7 @@ pub enum Message {
|
|||
Token(TokenUpdate),
|
||||
ConfigChanged(TimeAppletConfig),
|
||||
TimezoneUpdate(String),
|
||||
Surface(SurfaceMessage),
|
||||
}
|
||||
|
||||
impl From<Message> for MessageWrapper<Message> {
|
||||
fn from(value: Message) -> Self {
|
||||
match value {
|
||||
Message::Surface(s) => MessageWrapper::Surface(s),
|
||||
m => MessageWrapper::Message(m),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<SurfaceMessage> for Message {
|
||||
fn from(value: SurfaceMessage) -> Self {
|
||||
Message::Surface(value)
|
||||
}
|
||||
Surface(surface::Action),
|
||||
}
|
||||
|
||||
impl Window {
|
||||
|
|
@ -131,10 +115,7 @@ impl cosmic::Application for Window {
|
|||
type Flags = ();
|
||||
const APP_ID: &'static str = "com.system76.CosmicAppletTime";
|
||||
|
||||
fn init(
|
||||
core: app::Core,
|
||||
_flags: Self::Flags,
|
||||
) -> (Self, cosmic::iced::Task<app::Message<Self::Message>>) {
|
||||
fn init(core: app::Core, _flags: Self::Flags) -> (Self, app::Task<Self::Message>) {
|
||||
fn get_local() -> Result<Locale, Box<dyn std::error::Error>> {
|
||||
let locale = std::env::var("LC_TIME").or_else(|_| std::env::var("LANG"))?;
|
||||
let locale = locale
|
||||
|
|
@ -312,10 +293,7 @@ impl cosmic::Application for Window {
|
|||
])
|
||||
}
|
||||
|
||||
fn update(
|
||||
&mut self,
|
||||
message: Self::Message,
|
||||
) -> cosmic::iced::Task<app::Message<Self::Message>> {
|
||||
fn update(&mut self, message: Self::Message) -> app::Task<Self::Message> {
|
||||
match message {
|
||||
Message::TogglePopup => {
|
||||
if let Some(p) = self.popup.take() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue