diff --git a/Cargo.lock b/Cargo.lock index 77bba2e..297cd2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1364,7 +1364,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "atomicwrites", "calloop 0.14.0", @@ -1387,7 +1387,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "quote", "syn 1.0.109", @@ -1606,7 +1606,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "almost", "cosmic-config", @@ -2898,7 +2898,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_accessibility", @@ -2917,7 +2917,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "accesskit", "accesskit_unix", @@ -2926,7 +2926,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2948,7 +2948,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "futures", "iced_core", @@ -2961,7 +2961,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2985,7 +2985,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2997,7 +2997,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_accessibility", @@ -3011,7 +3011,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "enum-repr", "float-cmp", @@ -3037,7 +3037,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "iced_core", "once_cell", @@ -3047,7 +3047,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bytemuck", "cosmic-text", @@ -3064,7 +3064,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -3090,7 +3090,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_renderer", @@ -3107,7 +3107,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "dnd", "iced_graphics", @@ -3625,7 +3625,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#e04c9eaf6d66b4c3c1094163eb0ee31050f97656" +source = "git+https://github.com/pop-os/libcosmic#76667418d8e97bfb7dc89cbca6c6e67dbf47e9ab" dependencies = [ "apply", "ashpd", diff --git a/cosmic-settings/src/pages/desktop/dock/mod.rs b/cosmic-settings/src/pages/desktop/dock/mod.rs index 8fc030f..fe6894d 100644 --- a/cosmic-settings/src/pages/desktop/dock/mod.rs +++ b/cosmic-settings/src/pages/desktop/dock/mod.rs @@ -155,7 +155,7 @@ pub(crate) fn enable() -> Section { return Element::from(text(fl!("unknown"))); }; settings::view_section(§ion.title) - .add(settings::flex_item( + .add(settings::item( &descriptions[dock], toggler( None, diff --git a/cosmic-settings/src/pages/desktop/options.rs b/cosmic-settings/src/pages/desktop/options.rs index 72cb256..f17bc22 100644 --- a/cosmic-settings/src/pages/desktop/options.rs +++ b/cosmic-settings/src/pages/desktop/options.rs @@ -125,7 +125,7 @@ pub fn window_controls() -> Section { let descriptions = §ion.descriptions; settings::view_section(§ion.title) - .add(settings::flex_item( + .add(settings::item( &descriptions[minimize], toggler( None, @@ -133,7 +133,7 @@ pub fn window_controls() -> Section { super::Message::ShowMinimizeButton, ), )) - .add(settings::flex_item( + .add(settings::item( &descriptions[maximize], toggler( None, diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs index 83987d2..2c5cefe 100644 --- a/cosmic-settings/src/pages/desktop/panel/inner.rs +++ b/cosmic-settings/src/pages/desktop/panel/inner.rs @@ -110,13 +110,13 @@ pub(crate) fn behavior_and_position< return Element::from(text(fl!("unknown"))); }; settings::view_section(§ion.title) - .add(settings::flex_item( + .add(settings::item( &descriptions[autohide_label], toggler(None, panel_config.autohide.is_some(), |value| { Message::AutoHidePanel(value) }), )) - .add(settings::flex_item( + .add(settings::item( &descriptions[position], dropdown( page.anchors.as_slice(), @@ -124,7 +124,7 @@ pub(crate) fn behavior_and_position< Message::PanelAnchor, ), )) - .add(settings::flex_item( + .add(settings::item( &descriptions[display], dropdown( page.outputs.as_slice(), @@ -166,19 +166,19 @@ pub(crate) fn style< return Element::from(text(fl!("unknown"))); }; settings::view_section(§ion.title) - .add(settings::flex_item( + .add(settings::item( &descriptions[gap_label], toggler(None, panel_config.anchor_gap, |value| { Message::AnchorGap(value) }), )) - .add(settings::flex_item( + .add(settings::item( &descriptions[extend_label], toggler(None, panel_config.expand_to_edges, |value| { Message::ExtendToEdge(value) }), )) - .add(settings::flex_item( + .add(settings::item( &descriptions[appearance], dropdown( inner.backgrounds.as_slice(), diff --git a/cosmic-settings/src/pages/desktop/wallpaper/mod.rs b/cosmic-settings/src/pages/desktop/wallpaper/mod.rs index e4ea013..be25b26 100644 --- a/cosmic-settings/src/pages/desktop/wallpaper/mod.rs +++ b/cosmic-settings/src/pages/desktop/wallpaper/mod.rs @@ -1223,7 +1223,7 @@ pub fn settings() -> Section { children.push({ let mut column = list_column() - .add(settings::flex_item( + .add(settings::item( &descriptions[same_label], toggler( None, @@ -1231,10 +1231,10 @@ pub fn settings() -> Section { Message::SameWallpaper, ), )) - .add(settings::flex_item(&descriptions[fit_label], wallpaper_fit)); + .add(settings::item(&descriptions[fit_label], wallpaper_fit)); if show_slideshow_toggle { - column = column.add(settings::flex_item( + column = column.add(settings::item( &descriptions[slide_label], toggler(None, slideshow_enabled, Message::Slideshow), )); @@ -1243,7 +1243,7 @@ pub fn settings() -> Section { // The rotation frequency dropdown should only be shown when the slideshow is enabled. if slideshow_enabled { column - .add(settings::flex_item( + .add(settings::item( &descriptions[change_label], dropdown( &page.rotation_options, diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs index 76a737c..de2621e 100644 --- a/cosmic-settings/src/pages/display/mod.rs +++ b/cosmic-settings/src/pages/display/mod.rs @@ -1001,7 +1001,7 @@ pub fn display_configuration() -> Section { let display_options = (page.show_display_options && active_output.enabled).then(|| { list_column() - .add(widget::settings::flex_item( + .add(widget::settings::item( &descriptions[resolution], dropdown( &page.cache.resolutions, @@ -1009,7 +1009,7 @@ pub fn display_configuration() -> Section { Message::Resolution, ), )) - .add(widget::settings::flex_item( + .add(widget::settings::item( &descriptions[refresh_rate], dropdown( &page.cache.refresh_rates, @@ -1017,7 +1017,7 @@ pub fn display_configuration() -> Section { Message::RefreshRate, ), )) - .add(widget::settings::flex_item( + .add(widget::settings::item( &descriptions[scale], dropdown( &["50%", "75%", "100%", "125%", "150%", "175%", "200%"], @@ -1025,7 +1025,7 @@ pub fn display_configuration() -> Section { Message::Scale, ), )) - .add(widget::settings::flex_item( + .add(widget::settings::item( &descriptions[orientation], dropdown( &page.cache.orientations, @@ -1060,11 +1060,11 @@ pub fn display_configuration() -> Section { || !active_output.enabled) .then(|| { list_column() - .add(widget::settings::flex_item( + .add(widget::settings::item( &descriptions[enable_label], toggler(None, active_output.enabled, Message::DisplayToggle), )) - .add(widget::settings::flex_item( + .add(widget::settings::item( &descriptions[mirroring_label], widget::dropdown::multi::dropdown( &page.mirror_menu, diff --git a/cosmic-settings/src/pages/time/date.rs b/cosmic-settings/src/pages/time/date.rs index 42599ba..04e1410 100644 --- a/cosmic-settings/src/pages/time/date.rs +++ b/cosmic-settings/src/pages/time/date.rs @@ -152,7 +152,7 @@ fn format() -> Section { ) // First day of week .add( - settings::item::builder(§ion.descriptions[first]).flex_control(dropdown( + settings::item::builder(§ion.descriptions[first]).control(dropdown( &*WEEKDAYS, match page.first_day_of_week { 4 => Some(0), // friday