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

chore: update

Browse source
This commit is contained in:
Ashley Wulber 2024-03-06 15:05:11 -05:00 • committed by Michael Murphy
parent 9175e7e9ee
commit 56e04a7d81
6 changed files with 182 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

498
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
app/Cargo.toml
View file

@ -40,7 +40,7 @@ notify = "6.1.1"
anyhow = "1.0" anyhow = "1.0"
image = "0.24.8" image = "0.24.8"
serde = { version = "1.0.196", features = ["derive"] } serde = { version = "1.0.196", features = ["derive"] }
ashpd = { version = "0.6.8", default-features = false } ashpd = { version = "0.7", default-features = false }
ron = "0.8" ron = "0.8"
static_init = "1.0.3" static_init = "1.0.3"
clap = {version = "4.4.18", features = ["derive"] } clap = {version = "4.4.18", features = ["derive"] }

4
app/src/pages/desktop/options.rs
View file

@ -127,7 +127,7 @@ pub fn panel_dock_links() -> Section<crate::pages::Message> {
.control(control) .control(control)
.spacing(16) .spacing(16)
.apply(container) .apply(container)
.style(theme::Container::custom(list::style)) .style(theme::Container::List)
.apply(button) .apply(button)
.style(theme::Button::Transparent) .style(theme::Button::Transparent)
.on_press(crate::pages::Message::Page(panel_entity)), .on_press(crate::pages::Message::Page(panel_entity)),
@ -150,7 +150,7 @@ pub fn panel_dock_links() -> Section<crate::pages::Message> {
.control(control) .control(control)
.spacing(16) .spacing(16)
.apply(container) .apply(container)
.style(theme::Container::custom(list::style)) .style(theme::Container::List)
.apply(button) .apply(button)
.style(theme::Button::Transparent) .style(theme::Button::Transparent)
.on_press(crate::pages::Message::Page(dock_entity)), .on_press(crate::pages::Message::Page(dock_entity)),

2
app/src/pages/desktop/panel/inner.rs
View file

@ -243,7 +243,7 @@ pub(crate) fn configuration<P: page::Page<crate::pages::Message> + PanelPage>(
.control(control) .control(control)
.spacing(16) .spacing(16)
.apply(container) .apply(container)
.style(theme::Container::custom(list::style)) .style(theme::Container::List)
.apply(button) .apply(button)
.style(theme::Button::Transparent) .style(theme::Button::Transparent)
.on_press(crate::pages::Message::Page(panel_applets_entity)), .on_press(crate::pages::Message::Page(panel_applets_entity)),

11
app/src/pages/input/keyboard/mod.rs
View file

@ -67,12 +67,7 @@ impl SpecialKey {
fn popover_menu_row(label: String) -> cosmic::Element<'static, Message> { fn popover_menu_row(label: String) -> cosmic::Element<'static, Message> {
widget::text(label) widget::text(label)
.apply(widget::container) .apply(widget::container)
.style(cosmic::theme::Container::custom(|theme| { .style(cosmic::theme::Container::List)
iced_style::container::Appearance {
background: None,
..cosmic::widget::list::style(theme)
}
}))
.apply(button) .apply(button)
.style(theme::Button::Transparent) .style(theme::Button::Transparent)
.into() .into()
@ -319,9 +314,7 @@ fn go_next_control<Msg: Clone + 'static>() -> cosmic::Element<'static, Msg> {
fn go_next_item<Msg: Clone + 'static>(description: &str, msg: Msg) -> cosmic::Element<'_, Msg> { fn go_next_item<Msg: Clone + 'static>(description: &str, msg: Msg) -> cosmic::Element<'_, Msg> {
settings::item(description, go_next_control()) settings::item(description, go_next_control())
.apply(widget::container) .apply(widget::container)
.style(cosmic::theme::Container::custom( .style(cosmic::theme::Container::List)
cosmic::widget::list::style,
))
.apply(button) .apply(button)
.style(theme::Button::Transparent) .style(theme::Button::Transparent)
.on_press(msg) .on_press(msg)

2
app/src/widget/mod.rs
View file

@ -91,7 +91,7 @@ pub fn page_list_item<'a, Message: 'static + Clone>(
.spacing(16) .spacing(16)
.apply(container) .apply(container)
.padding([20, 24]) .padding([20, 24])
.style(theme::Container::custom(list::style)) .style(theme::Container::List)
.apply(button) .apply(button)
.style(theme::Button::Transparent) .style(theme::Button::Transparent)
.on_press(message) .on_press(message)