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

fix(dock) add applet button

Browse source
This commit is contained in:
Ashley Wulber 2024-05-20 15:08:31 -04:00 • committed by Ashley Wulber
parent ff4cd49965
commit bf6201d54a
2 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cosmic-settings/src/pages/desktop/dock/applets.rs
View file

@ -1,4 +1,10 @@
use cosmic::{cosmic_config::CosmicConfigEntry, iced_runtime::Command, Element}; use cosmic::{
cosmic_config::CosmicConfigEntry,
iced::{alignment, Length},
iced_runtime::Command,
widget::{button, container, row, text},
Apply, Element,
};
use cosmic_panel_config::CosmicPanelConfig; use cosmic_panel_config::CosmicPanelConfig;
use cosmic_settings_page::{self as page, section, Section}; use cosmic_settings_page::{self as page, section, Section};
use slotmap::SlotMap; use slotmap::SlotMap;
@ -74,7 +80,26 @@ impl page::Page<crate::pages::Message> for Page {
} }
fn info(&self) -> page::Info { fn info(&self) -> page::Info {
page::Info::new("dock_applets", "preferences-dock-symbolic") page::Info::new("dock_applets", "preferences-dock-symbolic").title(fl!("applets"))
}
fn header_view(&self) -> Option<Element<'_, crate::pages::Message>> {
let theme = cosmic::theme::active();
let spacing = theme.cosmic().spacing;
let content = row::with_capacity(2)
.spacing(spacing.space_xxs)
.push(
button(text(fl!("add-applet")))
.on_press(Message(applets_inner::Message::AddAppletDrawer))
.padding([spacing.space_xxs, spacing.space_xs]),
)
.apply(container)
.width(Length::Fill)
.align_x(alignment::Horizontal::Right)
.apply(Element::from)
.map(crate::pages::Message::DockApplet);
Some(content)
} }
fn context_drawer(&self) -> Option<Element<crate::pages::Message>> { fn context_drawer(&self) -> Option<Element<crate::pages::Message>> {

8
cosmic-settings/src/pages/desktop/panel/applets_inner.rs
View file

@ -135,7 +135,7 @@ impl page::Page<crate::pages::Message> for Page {
.spacing(spacing.space_xxs) .spacing(spacing.space_xxs)
.push( .push(
button(text(fl!("add-applet"))) button(text(fl!("add-applet")))
.on_press(Message::AddAppletDialog) .on_press(Message::AddAppletDrawer)
.padding([spacing.space_xxs, spacing.space_xs]), .padding([spacing.space_xxs, spacing.space_xs]),
) )
.apply(container) .apply(container)
@ -177,7 +177,7 @@ pub enum Message {
DnDCommand(Arc<Box<dyn Send + Sync + Fn() -> ActionInner>>), DnDCommand(Arc<Box<dyn Send + Sync + Fn() -> ActionInner>>),
Search(String), Search(String),
AddApplet(Applet<'static>), AddApplet(Applet<'static>),
AddAppletDialog, AddAppletDrawer,
Save, Save,
Cancel, Cancel,
} }
@ -202,7 +202,7 @@ impl Debug for Message {
Message::Cancel => write!(f, "Cancel"), Message::Cancel => write!(f, "Cancel"),
Message::Search(_) => write!(f, "Search"), Message::Search(_) => write!(f, "Search"),
Message::AddApplet(_) => write!(f, "AddApplet"), Message::AddApplet(_) => write!(f, "AddApplet"),
Message::AddAppletDialog => write!(f, "AddAppletDialogue"), Message::AddAppletDrawer => write!(f, "AddAppletDialogue"),
} }
} }
} }
@ -454,7 +454,7 @@ impl Page {
list.push(applet.id.to_string()); list.push(applet.id.to_string());
self.save(); self.save();
} }
Message::AddAppletDialog => { Message::AddAppletDrawer => {
self.context = Some(ContextDrawer::AddApplet); self.context = Some(ContextDrawer::AddApplet);
return cosmic::command::message(app::Message::OpenContextDrawer(Cow::Owned(fl!( return cosmic::command::message(app::Message::OpenContextDrawer(Cow::Owned(fl!(
"add-applet" "add-applet"